Dave Syer a86796f126 Merge remote-tracking branch 'origin/1.3.x' ...

Conflicts:
	spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java

2016-05-04 14:14:19 +01:00

..

main

Merge remote-tracking branch 'origin/1.3.x'

2016-05-04 14:14:19 +01:00

test

Merge remote-tracking branch 'origin/1.3.x'

2016-05-04 14:14:19 +01:00