Merge proposals dependent on lp:~mandel/ubuntuone-client/fix-os-helper

lp:~mandel/ubuntuone-client/fix-os-helper has no merge proposals.