desktopcouch

Merge proposals dependent on lp://qastaging/~cmiller/desktopcouch/replication-with-new-pycouchdb-fixed

  1. replication-with-new-pycouchdb-fixed
  2. Dependent merge proposals

lp://qastaging/~cmiller/desktopcouch/replication-with-new-pycouchdb-fixed has no merge proposals.