Phillip Webb 1e4d974ec0 Merge remote-tracking branch 'local12x/1.2.x'

2015-10-19 12:56:55 -07:00

..

main

Reformat code using Eclipse Mars

2015-10-07 23:37:10 -07:00

test/java/sample/parent

Organize imports with new settings

2015-10-19 12:55:44 -07:00