From: James Moger <james.moger@gitblit.com>
Date: Sat, 5 Jul 2014 17:25:26 +0000 (-0400)
Subject: Merge branch 'ticket/139'
X-Git-Tag: v1.6.1~66
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3e0c6ca8a65bd4b076cac1451c9cdfde4be1d4b8;p=gitblit.git

Merge branch 'ticket/139'

Conflicts:
	src/main/java/com/gitblit/servlet/RawServlet.java
---

3e0c6ca8a65bd4b076cac1451c9cdfde4be1d4b8