Phillip Webb fffc6f5dd2 Merge branch '1.2.x'

2015-06-18 12:52:56 -07:00

..

java

Merge branch '1.2.x'

2015-06-18 12:52:56 -07:00

plugins/custom

Revert "Test that auto configurations can be added by init scripts"

2014-01-08 11:43:59 +00:00

resources

Merge branch '1.2.x'

2015-06-18 12:52:56 -07:00