Tiny cosmetic change in debian/watch.
Update maintainer's email address.
Simplify get-orig-source section in debian/rules.
Update debian/changelog.
Merge branch 'master' into wheezy-backports
Update debian/changelog.