From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 8 Mar 2011 06:06:11 +0000 (+0100)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
X-Git-Tag: 0.7~1^2~2^2
X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=commitdiff_plain;h=330c9bc3a9008ac4937e79e80a0d383ce082f7c1

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

330c9bc3a9008ac4937e79e80a0d383ce082f7c1