Merge branch 'master' of git.dolda2000.com:/srv/git/r/automanga
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 4 May 2014 21:00:50 +0000 (23:00 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 4 May 2014 21:00:50 +0000 (23:00 +0200)
commitb3b2722affc8db61c2d6c4f34404bd5a0c005c3f
tree6c59cf01159191785fdb029153017641af2caf2b
parent24f0a3b7536a0366efb49bbe47f3a784002646ff
parent1e28222bb93251b69b2dccdc1ef4fe524a73e84a
Merge branch 'master' of git.dolda2000.com:/srv/git/r/automanga

Conflicts:
automanga