Merge proposals dependent on lp:~jml/bzr/fix-diff-docstring

lp:~jml/bzr/fix-diff-docstring has no merge proposals.