Ubuntu One Client

Merge proposals dependent on lp://staging/~verterok/ubuntuone-client/fix_file_shelf_tests_long_filename-stable-1-2

  1. fix_file_shelf_tests_long_filename-stable-1-2
  2. Dependent merge proposals

lp://staging/~verterok/ubuntuone-client/fix_file_shelf_tests_long_filename-stable-1-2 has no merge proposals.