From: Fredrik Tolf Date: Tue, 22 May 2012 00:37:23 +0000 (+0200) Subject: Merge branch 'master' of /srv/git/r/doldaconnect X-Git-Url: http://git.dolda2000.com/gitweb/?p=doldaconnect.git;a=commitdiff_plain;h=d6932520155665f13a3af7ab40ca6a724328d09f Merge branch 'master' of /srv/git/r/doldaconnect --- d6932520155665f13a3af7ab40ca6a724328d09f