Merge branch 'release' into squeeze-backports
authorDavid Bremner <bremner@debian.org>
Sun, 17 Jun 2012 10:38:59 +0000 (07:38 -0300)
committerDavid Bremner <bremner@debian.org>
Sun, 17 Jun 2012 10:38:59 +0000 (07:38 -0300)
commit3dc2ff6fc73d3a057ae0a3f350c42b077d7ec273
tree19322fd5112777d877a7e31eef3efbc4ac0ef6cd
parent3b1e8a200dd4740b3c5605256e1535a681367347
parent2ef24acf03fdd73e39d2c233016e71f194affbcf
Merge branch 'release' into squeeze-backports

Conflicts:
debian/changelog
debian/changelog