Merge branch 'jessie'
authorColin Watson <cjwatson@debian.org>
Tue, 14 May 2013 20:07:12 +0000 (21:07 +0100)
committerColin Watson <cjwatson@debian.org>
Tue, 14 May 2013 20:07:12 +0000 (21:07 +0100)
commit3ae82ac6cdfccc2b504bbd102ee6377d375e276b
treeeaab56c9d0426e001f7e9c7c7e0bb2843c90ad87
parentfe3f419681d07a31aa81a4f1451a56d16313b356
parent53a8fbaa2133d871260598dedd87937cc58e37e5
Merge branch 'jessie'

Conflicts:
debian/changelog
debian/control
debian/changelog
debian/control