Merge commit 'debian/2.1.1-1' into debian
authorGerfried Fuchs <rhonda@debian.at>
Tue, 9 Sep 2008 10:27:49 +0000 (12:27 +0200)
committerGerfried Fuchs <rhonda@debian.at>
Tue, 9 Sep 2008 10:27:49 +0000 (12:27 +0200)
commitab610a555d860fd48269af15fae725e640489914
tree9a956ffc5dbf472c753f7a541055749a032bd390
parent828922619c4124fc94ec6b1be4e96974a67a1b3d
parentb6f3fe1110df4c616724be11638a5f2d32bc375b
Merge commit 'debian/2.1.1-1' into debian

Conflicts:

debian/changelog
debian/changelog
debian/control