Merge branch 'ticket/187' into develop

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

Thu, 25 Sep 2014 13:17:44 +0000 (09:17 -0400)

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

Thu, 25 Sep 2014 13:17:44 +0000 (09:17 -0400)
author James Moger <james.moger@gitblit.com>
Thu, 25 Sep 2014 13:17:44 +0000 (09:17 -0400)
committer James Moger <james.moger@gitblit.com>
Thu, 25 Sep 2014 13:17:44 +0000 (09:17 -0400)
diff --cc src/main/java/com/gitblit/manager/AuthenticationManager.java
Simple merge
diff --cc src/main/java/com/gitblit/manager/GitblitManager.java
Simple merge
author	James Moger <james.moger@gitblit.com>
	Thu, 25 Sep 2014 13:17:44 +0000 (09:17 -0400)
committer	James Moger <james.moger@gitblit.com>
	Thu, 25 Sep 2014 13:17:44 +0000 (09:17 -0400)
		1	2
src/main/java/com/gitblit/manager/AuthenticationManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/main/java/com/gitblit/manager/GitblitManager.java	patch \|	diff1 \|	diff2 \|	blob \| history