Merge branch 'ticket/167' into develop

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

Fri, 5 Sep 2014 23:20:08 +0000 (19:20 -0400)

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

Fri, 5 Sep 2014 23:20:08 +0000 (19:20 -0400)
author James Moger <james.moger@gitblit.com>
Fri, 5 Sep 2014 23:20:08 +0000 (19:20 -0400)
committer James Moger <james.moger@gitblit.com>
Fri, 5 Sep 2014 23:20:08 +0000 (19:20 -0400)
diff --cc src/main/java/com/gitblit/manager/GitblitManager.java
Simple merge
author	James Moger <james.moger@gitblit.com>
	Fri, 5 Sep 2014 23:20:08 +0000 (19:20 -0400)
committer	James Moger <james.moger@gitblit.com>
	Fri, 5 Sep 2014 23:20:08 +0000 (19:20 -0400)