desktopcouch

Merge proposals dependent on lp://qastaging/~thisfred/desktopcouch/fix-fieldmappings

  1. fix-fieldmappings
  2. Dependent merge proposals

lp://qastaging/~thisfred/desktopcouch/fix-fieldmappings has no merge proposals.