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