Andy Wilkinson 8e5556bcfa Merge branch '1.1.x' ...

Conflicts:
	spring-boot-dependencies/pom.xml

2014-08-19 13:11:15 +01:00

..

pom.xml

Merge branch '1.1.x'

2014-08-19 13:11:15 +01:00