Merge proposals dependent on lp://qastaging/~vila/bzr/525571-lock-bazaar-conf-files

lp://qastaging/~vila/bzr/525571-lock-bazaar-conf-files has no merge proposals.