Merge proposals dependent on lp:~cmiller/desktopcouch/reconnect-on-couch-death

lp:~cmiller/desktopcouch/reconnect-on-couch-death has no merge proposals.