ether/etherpad-lite — pull request #2342 by luto (2014-11-25 21:09:49+00:00)
Title: fix #2320

see commit message and #2320 for more info.