Merge branch 'ticket/161' into develop

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

Mon, 8 Sep 2014 17:41:28 +0000 (13:41 -0400)

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

Mon, 8 Sep 2014 17:41:28 +0000 (13:41 -0400)
author James Moger <james.moger@gitblit.com>
Mon, 8 Sep 2014 17:41:28 +0000 (13:41 -0400)
committer James Moger <james.moger@gitblit.com>
Mon, 8 Sep 2014 17:41:28 +0000 (13:41 -0400)
diff --cc src/main/java/com/gitblit/manager/RepositoryManager.java
Simple merge
diff --cc src/main/java/com/gitblit/manager/ServicesManager.java
Simple merge
diff --cc src/main/java/com/gitblit/servlet/FederationServlet.java
Simple merge
author	James Moger <james.moger@gitblit.com>
	Mon, 8 Sep 2014 17:41:28 +0000 (13:41 -0400)
committer	James Moger <james.moger@gitblit.com>
	Mon, 8 Sep 2014 17:41:28 +0000 (13:41 -0400)
		1	2
src/main/java/com/gitblit/manager/RepositoryManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/main/java/com/gitblit/manager/ServicesManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/main/java/com/gitblit/servlet/FederationServlet.java	patch \|	diff1 \|	diff2 \|	blob \| history