Merge pull request #4 from gitblit/master

merge upstream master