Merge proposals dependent on lp:~qbzr-dev/qbzr/bug-487560

lp:~qbzr-dev/qbzr/bug-487560 has no merge proposals.