Merge proposals dependent on lp:~ricotz/bamf/annotation-fixes

lp:~ricotz/bamf/annotation-fixes has no merge proposals.