Andy Wilkinson 150b85e10d Merge branch '1.1.x' ...

Conflicts:
	spring-boot-dependencies/pom.xml

2014-11-10 11:29:21 +00:00

..

src

Merge branch '1.1.x'

2014-11-10 11:29:21 +00:00

pom.xml

Next development version

2014-10-10 15:19:47 -07:00