Merge branch 'develop' of github.com:ether/etherpad-lite into release/releases-1.2.6

This commit is contained in:
John McLear 2013-01-20 14:31:30 +00:00
commit 76d571c9fa

Diff content is not available