Change build dependency from libotr5-dev to 'libotr5-dev | libotr2-dev'.
Simplify get-orig-source section in debian/rules.
Bump Standards-Version to 3.9.5 (was 3.9.4): no changes required.
Package psi-plus-plugins now replaces psi-plus-content-download.
It does not affect users of Debian >= 7.0 (Wheezy), but it still may be
useful for some users (see #731106 for example).
Bump debhelper version to 9 (was 8); update debian/compat.
Update debian/changelog.
Merge branch 'master' into wheezy-backports
Update debian/changelog.