From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 27 Dec 2012 07:15:26 +0000 (+0100)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
X-Git-Tag: 0.12~22
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=4e8fb5cddb8dc1620ac9d1b46cce54ad6f717716;hp=4e8fb5cddb8dc1620ac9d1b46cce54ad6f717716;p=ashd.git

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