Merge branch 'master' of git.dolda2000.com:/srv/git/r/automanga
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 30 Oct 2015 01:28:20 +0000 (02:28 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 30 Oct 2015 01:28:20 +0000 (02:28 +0100)

Trivial merge