From: Fredrik Tolf Date: Thu, 14 Feb 2008 18:08:40 +0000 (+0100) Subject: Merge branch 'dpkg' of pc18:/srv/git/r/doldaconnect into dpkg X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fdpkg;hp=-c;p=doldaconnect.git Merge branch 'dpkg' of pc18:/srv/git/r/doldaconnect into dpkg Conflicts: debian/changelog debian/control debian/rules nothing to commit (working directory clean) --- 2fd736671b6032057095f3669eb15cd9ee7350bc