Merge proposals dependent on lp://staging/~jaywink/diaspora-ppa/diaspora-develop-setup

lp://staging/~jaywink/diaspora-ppa/diaspora-develop-setup has no merge proposals.