Merge branch 'master' of git.dolda2000.com:/srv/git/r/automanga
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 13 Jul 2013 05:39:39 +0000 (07:39 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 13 Jul 2013 05:39:39 +0000 (07:39 +0200)
commitddc2438e18c52f938220dae26d21e3150264a3c6
tree473a970acce35e36047052c05939ddb64a8f4db3
parent477d3ba08adf5083f22a92a9836d32dfa679472a
parentd2f58cfc0a7804bb3aad1cbe190c6b83a2a5cde3
Merge branch 'master' of git.dolda2000.com:/srv/git/r/automanga

Conflicts:
manga/mangafox.py