Merge branch 'custom-obj-msg' of github.com:ether/etherpad-lite into develop
Merge branch 'custom-obj-msg' of github.com:ether/etherpad-lite into develop
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
longer timeout on reconnection
Merge pull request #1697 from ether/longer-timeout

Longer timeout
whoops padid should be in payload..
whoops, comments hurt
weird styling
Merge pull request #1699 from ether/fix-custom

Fix custom obj msg broadcaster to pads
Kick the user if has already successfully authenticated but his session became invalid later
Merge pull request #1703 from mluto/kick-users-with-invalid-session-2

Kick the user if the deleteSession-API is called
changelog and package file
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
new readme
line breaks
line breaks 2