Mention the fix in the changelog
branch out stuff not ready to ship to a feature branch
Merge branch 'master' of ssh://git.debian.org/git/collab-maint/dputng

Conflicts:
	debian/changelog