Pita/etherpad-lite — pull request #837 by redhog (2012-07-03 21:57:41+00:00)
Title: Changes from pita/master not in develop :(

This brings develop up to speed with bugfixes on master