Pita/etherpad-lite — comment on commit 8cceeefa052ed59b8cbd8b356f7c57725d47cc7c
File:  line 0
By johnyma22:

There are going to be merge conflicts with this and the latest master on pad.html just fyi