Merge branch 'dpkg' of pc18:/srv/git/r/doldaconnect into dpkg dpkg
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 14 Feb 2008 18:08:40 +0000 (19:08 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 14 Feb 2008 18:08:40 +0000 (19:08 +0100)
commit2fd736671b6032057095f3669eb15cd9ee7350bc
treed8d5e5c8158c35895e7ab5147222bf9830838f43
parentec3c21088dd15c366f765b99532954226b5ad509
parent2d3c1d352873da085e373a36c1ce1b43eedf49c9
Merge branch 'dpkg' of pc18:/srv/git/r/doldaconnect into dpkg

Conflicts:

debian/changelog
debian/control
debian/rules

nothing to commit (working directory clean)