Merge proposals dependent on lp://qastaging/~vila/bzr/660125-shelve-rename-existing

lp://qastaging/~vila/bzr/660125-shelve-rename-existing has no merge proposals.