Merge branch 'master' into rpc

diff --cc build.xml
index fa40abd047baadb47c830d1bccc4d2bed0b1eb42,99c6e2e11a2ee41edbb0375b9c8846860cae4425..96da02dd2841eb89f45d7aeddaf7d5ac786ac336
--- 1/build.xml
--- 2/build.xml
+++ b/build.xml
@@@ -699,4 -637,4 +701,4 @@@
                <delete dir="${project.war.dir}" />\r
                <delete dir="${project.deploy.dir}" />\r
        </target>\r
--</project>
++</project>

diff --cc distrib/gitblit.properties
Simple merge

diff --cc docs/00_index.mkd
Simple merge

diff --cc docs/04_releases.mkd
Simple merge

diff --cc src/com/gitblit/Constants.java
Simple merge