Merge commit 'debian/0.11-1' into squeeze-backports
authorDavid Bremner <bremner@debian.org>
Fri, 27 Jan 2012 22:04:44 +0000 (18:04 -0400)
committerDavid Bremner <bremner@debian.org>
Fri, 27 Jan 2012 22:04:44 +0000 (18:04 -0400)
commitbcd44490684965082e5921d0fc71064af3170987
tree12506f79f6792236b95ef0d6a19ab5113bb4587d
parentbfb7feb1f51ae348503046823d72348621e34d08
parentffce9b7c25b9b44ec026b67d96e44cae09c99efe
Merge commit 'debian/0.11-1' into squeeze-backports

Conflicts:
debian/changelog
debian/changelog