Andy Wilkinson fec136e213 Merge branch '1.0.x' ...

Conflicts:
	spring-boot-dependencies/pom.xml

2014-05-12 10:37:06 +01:00

..

pom.xml

Merge branch '1.0.x'

2014-05-12 10:37:06 +01:00