From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 7 Jan 2009 10:52:52 +0000 (+0100)
Subject: Merge branch 'master' of /srv/git/r/ashd
X-Git-Tag: 0.1~104
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=f812ea037b5c693977e83ace9ed7ac2515a4a6d0;hp=f812ea037b5c693977e83ace9ed7ac2515a4a6d0;p=ashd.git

Merge branch 'master' of /srv/git/r/ashd
---