Merge branch 'debian-testing'
authorJoey Hess <joey@kitenet.net>
Sun, 15 Aug 2010 16:01:16 +0000 (12:01 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 15 Aug 2010 16:01:16 +0000 (12:01 -0400)
commit91f5697025ce92e64ad9d02c122d6a8d6df22278
treea850b59804e6702e1b21521690fc8803c64a9e21
parent522c88c2771177ca0074397f8d675bcecaa4f9de
parent77aaf95d5d72149b31900048ee8ef4125ffa5548
Merge branch 'debian-testing'

Conflicts:
debian/changelog
debian/changelog