]> git.deb.at Git - deb/packages.git/commitdiff
Merge branch 'master' into debian-master
authorGerfried Fuchs <rhonda@debian.org>
Thu, 24 Mar 2011 10:20:14 +0000 (11:20 +0100)
committerGerfried Fuchs <rhonda@debian.org>
Thu, 24 Mar 2011 10:20:14 +0000 (11:20 +0100)
1  2 
debian/control

diff --cc debian/control
Simple merge