Merge proposals dependent on lp:~andrewfister/deja-dup/close-button-fix

lp:~andrewfister/deja-dup/close-button-fix has no merge proposals.