]> err.no Git - dak/commitdiff
Another merge from Thomas nicer-new tree
authorJoerg Jaspert <joerg@debian.org>
Sat, 3 May 2008 17:48:55 +0000 (19:48 +0200)
committerJoerg Jaspert <joerg@debian.org>
Sat, 3 May 2008 17:48:55 +0000 (19:48 +0200)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge