Merge proposals dependent on lp:~jelmer/bzr-pqm/2.5-compat

lp:~jelmer/bzr-pqm/2.5-compat has no merge proposals.