From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 31 Oct 2007 05:00:03 +0000 (+0100)
Subject: Merge branch 'master' of pc18:/srv/git/r/doldaconnect
X-Git-Tag: 1.1~46
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=139620be0f4f1e9e1650e5cd9583e0564cb1cd11;hp=-c;p=doldaconnect.git

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

139620be0f4f1e9e1650e5cd9583e0564cb1cd11