Merge proposals dependent on lp:~smoser/cirros/0.3-dev

lp:~smoser/cirros/0.3-dev has no merge proposals.