Andy Wilkinson 73b80dbeed Merge branch '1.1.x' ...

Conflicts:
	spring-boot-dependencies/pom.xml

2014-10-06 13:50:47 +01:00

..

pom.xml

Merge branch '1.1.x'

2014-10-06 13:50:47 +01:00