Merge release 1.6.0

James Moger

2014-06-16 111b48c40cd2cc4e19e28c8b6af8379885fb617b

 src/test/config/test-gitblit.properties

@@ -7,6 +7,8 @@
git.searchRepositoriesSubfolders = true
git.enableGitServlet = true
git.daemonPort = 8300
git.sshPort = 29418
git.sshKeysManager = com.gitblit.transport.ssh.MemoryKeyManager
groovy.scriptsFolder = src/main/distrib/data/groovy
groovy.preReceiveScripts = blockpush
groovy.postReceiveScripts = sendmail