Merge branch 'rcaa-master' into master.

author Florian Zschocke <florian.zschocke@devolo.de>

Tue, 13 Dec 2016 15:56:59 +0000 (16:56 +0100)

committer Florian Zschocke <florian.zschocke@devolo.de>

Tue, 13 Dec 2016 15:57:39 +0000 (16:57 +0100)
author Florian Zschocke <florian.zschocke@devolo.de>
Tue, 13 Dec 2016 15:56:59 +0000 (16:56 +0100)
committer Florian Zschocke <florian.zschocke@devolo.de>
Tue, 13 Dec 2016 15:57:39 +0000 (16:57 +0100)
diff --cc src/main/java/com/gitblit/auth/LdapAuthProvider.java
Simple merge
author	Florian Zschocke <florian.zschocke@devolo.de>
	Tue, 13 Dec 2016 15:56:59 +0000 (16:56 +0100)
committer	Florian Zschocke <florian.zschocke@devolo.de>
	Tue, 13 Dec 2016 15:57:39 +0000 (16:57 +0100)