]> err.no Git - dak/commitdiff
Merge again from Thomas
authorJoerg Jaspert <joerg@debian.org>
Thu, 24 Apr 2008 21:27:03 +0000 (23:27 +0200)
committerJoerg Jaspert <joerg@debian.org>
Thu, 24 Apr 2008 21:27:03 +0000 (23:27 +0200)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge