From: Fredrik Tolf <fredrik@dolda2000.com>
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://dolda2000.com/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fdpkg;hp=ec3c21088dd15c366f765b99532954226b5ad509;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)
---