Merge proposals dependent on lp://qastaging/~thisfred/ubuntuone-client/reset-filenames2

lp://qastaging/~thisfred/ubuntuone-client/reset-filenames2 has no merge proposals.