Dave Syer ff46a7dc50 Merge branch '1.1.x' ...

Conflicts:
	spring-cloud-netflix-dependencies/pom.xml

2016-06-17 15:10:51 +01:00

..

pom.xml

Merge branch '1.1.x'

2016-06-17 15:10:51 +01:00