Huge bug fix
Merge pull request #48 from gogits/dev

Huge bug fix