merge changelog
authorJeremy Laine <jeremy.laine@m4x.org>
Sun, 8 Jul 2007 19:46:36 +0000 (19:46 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Sun, 8 Jul 2007 19:46:36 +0000 (19:46 +0000)
commitb4ec332fd4c6c36cc64d0ecf8533700091a9f06b
tree7dfcd1ac9a8cb1a3a08b6d8e055bd439e2a0aa9e
parentf71ab1350a5df9d95c542897cb97a1751cbda62b
merge changelog
debian/changelog