Merge proposals dependent on lp:~dobey/ubuntuone-client/update-3-0

lp:~dobey/ubuntuone-client/update-3-0 has no merge proposals.