From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 3 Feb 2013 02:16:55 +0000 (+0100)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
X-Git-Tag: 0.12~7
X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=commitdiff_plain;h=de6c0353aa0aad39c680a0b99c15fcafd6f0df24

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

de6c0353aa0aad39c680a0b99c15fcafd6f0df24