Merge branches
authorMichael Prokop <devnull@localhost>
Sun, 13 Jan 2008 13:29:09 +0000 (14:29 +0100)
committerMichael Prokop <devnull@localhost>
Sun, 13 Jan 2008 13:29:09 +0000 (14:29 +0100)
commitf44a0326893ad30927009056ce7a706b11460327
tree8a37691e15ea5ebed5c2b31320af7f494554a383
parent7c7b5c75595a5e6256d7c880ecee766f97fac611
parent0bca675bc0be092e9def716723f342d7ddc9164f
Merge branches
debian/changelog