Merge branch 'ticket/141' into develop

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

Thu, 4 Sep 2014 15:03:36 +0000 (11:03 -0400)

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

Thu, 4 Sep 2014 15:03:36 +0000 (11:03 -0400)
author James Moger <james.moger@gitblit.com>
Thu, 4 Sep 2014 15:03:36 +0000 (11:03 -0400)
committer James Moger <james.moger@gitblit.com>
Thu, 4 Sep 2014 15:03:36 +0000 (11:03 -0400)
diff --cc src/main/java/com/gitblit/servlet/GitblitContext.java
Simple merge
author	James Moger <james.moger@gitblit.com>
	Thu, 4 Sep 2014 15:03:36 +0000 (11:03 -0400)
committer	James Moger <james.moger@gitblit.com>
	Thu, 4 Sep 2014 15:03:36 +0000 (11:03 -0400)