ouufff, stupid bug is stupid
Merge branch 'master' of github.com:globaleaks/GlobaLeaks