Initial commit
Update README.md
Merge branch 'master' of github.com:Pita/etherpad-lite into develop

Conflicts:
	README.md
Merge remote branch 'ether/develop'
Merge branch 'develop' of github.com:ether/etherpad-lite into develop

Conflicts:
	README.md
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
Update src/static/js/pad.js

Gramatically change. Changed "You're Password" to "Your Password".
make runner CSS more sane
language test should pass int ravis now
Merge pull request #1193 from kingmook/patch-1

pad.js - Gramatical fix
Fix urls, use github.com/ether

Signed-off-by: Hyacinthe Cartiaux <hyacinthe.cartiaux@uni.lu>
Merge pull request #1197 from hcartiaux/urlfix

Fix urls, use github.com/ether
initial https version fix #1148
improving the translation of the timeline
test import converting to html instead to txt by default
cleaning
Ip => IP typo fix; +comment for SSL
chg server.key to epl-server.key
Import html by default and allow basic import/export features without abiword
Merge remote branch 'ether/develop'