From: James Moger <james.moger@gitblit.com>
Date: Mon, 10 Oct 2011 23:12:00 +0000 (-0400)
Subject: Merge branch 'master' into rpc
X-Git-Tag: v0.7.0~88
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=51e21e040c65781cea10b54365e87fa8e0459737;p=gitblit.git

Merge branch 'master' into rpc
---

51e21e040c65781cea10b54365e87fa8e0459737
diff --cc build.xml
index fa40abd0,99c6e2e1..96da02dd
--- a/build.xml
+++ b/build.xml
@@@ -699,4 -637,4 +701,4 @@@
  		<delete dir="${project.war.dir}" />
  		<delete dir="${project.deploy.dir}" />
  	</target>
--</project>
++</project>