Andy Wilkinson b40f689e1d Merge branch '1.1.x' ...

Conflicts:
	spring-boot-dependencies/pom.xml

2015-02-09 10:18:40 +00:00

..

pom.xml

Merge branch '1.1.x'

2015-02-09 10:18:40 +00:00