Merge pull request #1160 from fzs/sshLdapAuthenticator

author Florian Zschocke <fzs@users.noreply.github.com>

Sun, 18 Dec 2016 16:01:15 +0000 (17:01 +0100)

committer GitHub <noreply@github.com>

Sun, 18 Dec 2016 16:01:15 +0000 (17:01 +0100)
author Florian Zschocke <fzs@users.noreply.github.com>
Sun, 18 Dec 2016 16:01:15 +0000 (17:01 +0100)
committer GitHub <noreply@github.com>
Sun, 18 Dec 2016 16:01:15 +0000 (17:01 +0100)
diff --cc src/main/distrib/data/defaults.properties
Simple merge
diff --cc src/main/java/com/gitblit/auth/LdapAuthProvider.java
Simple merge
author	Florian Zschocke <fzs@users.noreply.github.com>
	Sun, 18 Dec 2016 16:01:15 +0000 (17:01 +0100)
committer	GitHub <noreply@github.com>
	Sun, 18 Dec 2016 16:01:15 +0000 (17:01 +0100)
		1	2
src/main/distrib/data/defaults.properties	patch \|	diff1 \|	diff2 \|	blob \| history
src/main/java/com/gitblit/auth/LdapAuthProvider.java	patch \|	diff1 \|	diff2 \|	blob \| history