Phillip Webb e473364e4e Merge branch '1.2.x'

2015-10-07 23:34:08 -07:00

..

java/sample/secure

Merge branch '1.2.x'

2015-10-07 23:34:08 -07:00

resources

Move properties file to correct location

2014-01-10 08:10:22 +00:00