Ubuntu One Client

Merge proposals dependent on lp:~nataliabidart/ubuntuone-client/conflict-only-when-needed

  1. conflict-only-when-needed
  2. Dependent merge proposals

lp:~nataliabidart/ubuntuone-client/conflict-only-when-needed has no merge proposals.