Merge proposals dependent on lp:~cjwatson/bzr/bzr-2.6.0-lp-2

lp:~cjwatson/bzr/bzr-2.6.0-lp-2 has no merge proposals.