Andy Wilkinson 56977c037d Merge branch '1.2.x'

2015-10-16 11:19:14 +01:00

..

main

Ignore parent contexts in message source auto-configuration

2015-10-16 11:07:39 +01:00

test

Merge branch '1.2.x'

2015-10-16 11:19:14 +01:00