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

Conflicts:
	spring-boot-dependencies/pom.xml

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

..

it

Unify versions in POMs started by the invoker

2014-05-28 14:35:28 +01:00

main/java/org/springframework/boot/loader

Merge branch '1.0.x'

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

test

Merge branch '1.0.x'

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