Andy Wilkinson 99fde7ac89 Merge branch '1.2.x' ...

Conflicts:
	spring-boot-dependencies/pom.xml

2015-03-26 17:19:44 +00:00

..

pom.xml

Merge branch '1.2.x'

2015-03-26 17:19:44 +00:00