take line breaks and treat them appropriatly instead of creating a space for them..
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
Merge branch 'develop' of github.com:ether/etherpad-lite into develop