From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 17 Apr 2008 14:37:59 +0000 (+0200)
Subject: Merge branch 'master' of pc18:/srv/git/r/doldaconnect
X-Git-Tag: 1.3~11^2^2~15
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=4eba46be47f9897458fb3c985f14f75138049880;p=doldaconnect.git

Merge branch 'master' of pc18:/srv/git/r/doldaconnect
---

4eba46be47f9897458fb3c985f14f75138049880