From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sat, 13 Jul 2013 05:39:39 +0000 (+0200)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/automanga
X-Git-Url: http://dolda2000.com/gitweb/?p=automanga.git;a=commitdiff_plain;h=ddc2438e18c52f938220dae26d21e3150264a3c6

Merge branch 'master' of git.dolda2000.com:/srv/git/r/automanga

Conflicts:
	manga/mangafox.py
---

ddc2438e18c52f938220dae26d21e3150264a3c6