Merge branch 'master' of https://github.com/gitblit/gitblit

mrbytes

2014-03-08 6be15a1cac2f98585174f501879c3685ef2a54b6

 .gitignore

@@ -24,3 +24,4 @@
/*.sh
/*.factorypath
/src/main/dagger
/src/main/java/.idea