Merge proposals dependent on lp:~diegosarmentero/ubuntuone-client/bug1169312

lp:~diegosarmentero/ubuntuone-client/bug1169312 has no merge proposals.