merge branches/2.5 into trunk
authorgregor herrmann <gregoa@debian.org>
Sat, 12 Sep 2009 22:28:00 +0000 (22:28 -0000)
committergregor herrmann <gregoa@debian.org>
Sat, 12 Sep 2009 22:28:00 +0000 (22:28 -0000)
commitcef16e6a0dc8ba57fc3e4f399badb43b339e71f3
tree1ddbcf47f3adfb805b1feee25a25e0827b9b16c5
parentfd825fd4d58ce53ea36a768f2d6dd54438cce579
parentd4418221c04104bb2fab2eca5911110367bba598
merge branches/2.5 into trunk
debian/changelog