Merge proposals dependent on lp:~thisfred/ubuntuone-couch/add-tests

lp:~thisfred/ubuntuone-couch/add-tests has no merge proposals.