Andy Wilkinson d5c0884d3d Merge branch '1.2.x' ...

Conflicts:
	spring-boot-dependencies/pom.xml

2015-04-14 09:50:05 +01:00

..

pom.xml

Merge branch '1.2.x'

2015-04-14 09:50:05 +01:00