ether/etherpad-lite — pull request #2414 by JohnMcLear (2014-12-29 00:55:55+00:00)
Title: Remove old

rebase stuff from @webzwo0i