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

Conflicts:
	spring-boot-dependencies/pom.xml

2014-12-10 16:03:45 +00:00

..

pom.xml

Merge branch '1.1.x'

2014-12-10 16:03:45 +00:00