Correct error message.
Merge pull request #839 from marcelklehr/fix-run.sh

Fix run.sh
Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop
actually fix run script ;)
Correct casing
Bugfix for broken readonly timeslider
Merge pull request #840 from redhog/master

Bugfix for readonly timeslider
Merge pull request #841 from Pita/releases-1.1.1

Releases 1.1.1
Bugfix to getLastEdited API method, issue #845
Bugfix to getLastEdited API method, issue #845
Merge pull request #846 from jhollinger/master

Fix getLastEdited API method
make /static/tests.html functional again,
added getLastEdited
Load npm to enable server to see the git revision.
remove unused _opt in favor of code size/readability
Use v8 to parse settings.json
Merge pull request #849 from marcelklehr/fix-git-version-receiver

Fix git version receiver
Make handleMessage async
Don't crash if setText isn't passed any text. issue #861
Merge pull request #863 from jhollinger/develop

Don't crash server if setText was given no text
Merge pull request #864 from Pita/develop

Merge bugfixes