From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Fri, 16 Dec 2011 05:49:12 +0000 (+0100)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
X-Git-Tag: 0.11~33
X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=commitdiff_plain;h=6ccb79c7d1851ff4dbe48572d49631be9829e726

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

6ccb79c7d1851ff4dbe48572d49631be9829e726