Merged #247 "Add Kerberos5/GSS authentication to ssh"

author James Moger <james.moger@gitblit.com>

Fri, 22 May 2015 01:24:22 +0000 (19:24 -0600)

committer James Moger <james.moger@gitblit.com>

Fri, 22 May 2015 01:24:22 +0000 (19:24 -0600)
author James Moger <james.moger@gitblit.com>
Fri, 22 May 2015 01:24:22 +0000 (19:24 -0600)
committer James Moger <james.moger@gitblit.com>
Fri, 22 May 2015 01:24:22 +0000 (19:24 -0600)
diff --cc src/main/distrib/data/defaults.properties
Simple merge
author	James Moger <james.moger@gitblit.com>
	Fri, 22 May 2015 01:24:22 +0000 (19:24 -0600)
committer	James Moger <james.moger@gitblit.com>
	Fri, 22 May 2015 01:24:22 +0000 (19:24 -0600)