From: David Goldberg <david.goldberg@contextream.com>
Date: Fri, 24 Jan 2014 05:42:16 +0000 (+0200)
Subject: Merge remote branch 'origin/release-1.0.X' into mer
X-Git-Tag: lispflowmapping-all-1.1.0~11
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=1f3fd2dc35483f97ba10f9cff4a064e1e2443eea;p=lispflowmapping.git

Merge remote branch 'origin/release-1.0.X' into mer

Conflicts:
	mappingservice/integrationtest/pom.xml

Change-Id: I62fc34b7c566198dc62ee1d20026ded5e579f303
Signed-off-by: David Goldberg <david.goldberg@contextream.com>
---

1f3fd2dc35483f97ba10f9cff4a064e1e2443eea