From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 4 May 2014 21:00:50 +0000 (+0200)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/automanga
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=b3b2722affc8db61c2d6c4f34404bd5a0c005c3f;p=automanga.git

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

Conflicts:
	automanga
---

b3b2722affc8db61c2d6c4f34404bd5a0c005c3f