Merge branch 'master-wheezy'
authorDidier Raboud <odyx@debian.org>
Wed, 15 May 2013 08:40:56 +0000 (10:40 +0200)
committerDidier Raboud <odyx@debian.org>
Wed, 15 May 2013 08:40:56 +0000 (10:40 +0200)
commitb459407133b43ce0bcb2231eff1408fe9f0b41b7
treefbd91dae06c1630e01f129af8c725144366d9325
parentc609eb2fc30cbf685f91727663ceceba50f864fe
parent10c0ad40af739e58b83825ca6dd9a6ceb3c8bf34
Merge branch 'master-wheezy'

Conflicts:
debian/changelog