Phillip Webb c35454e5f4 Merge branch '1.5.x'

2017-01-05 23:40:58 -08:00

..

src/main/resources/META-INF

Add LDAP auto-configuration support

2017-01-05 23:34:50 -08:00

pom.xml

Merge branch '1.5.x'

2017-01-05 23:40:58 -08:00