Phillip Webb 99af5dbe23 Merge branch '1.0.x' ...

Conflicts:
	spring-boot-dependencies/pom.xml

2014-05-28 14:57:13 +01:00

..

src

Merge branch '1.0.x'

2014-05-28 14:57:13 +01:00

pom.xml

Add maven implicit plugin group ID

2014-05-02 23:03:31 +01:00