desktopcouch

Merge proposals dependent on lp://qastaging/~cmiller/desktopcouch/proxy-for-consistent-port

  1. proxy-for-consistent-port
  2. Dependent merge proposals

lp://qastaging/~cmiller/desktopcouch/proxy-for-consistent-port has no merge proposals.