Merge proposals dependent on lp:~tvansteenburgh/charms/precise/etherpad-lite/fix-proof

lp:~tvansteenburgh/charms/precise/etherpad-lite/fix-proof has no merge proposals.