Merge proposals dependent on lp://staging/~etherpad/etherpad/ubuntu-lucid-backport

lp://staging/~etherpad/etherpad/ubuntu-lucid-backport has no merge proposals.