commit 3a0d9481ac0d037deb43fe93f35318acae763d6b (HEAD -> master,
origin/master, 
origin/HEAD)
Author: Maxime Coste <mawww@kakoune.org>
Date:   Sat May 13 11:05:09 2017 +0100

    Add the -E switch for server initialization commands
    
    Fixes #1361

commit 3d0f7a29e1da388753b957b192c876dc438dd30d
Merge: a9deb7fb 812af8c8
Author: Maxime Coste <mawww@kakoune.org>
Date:   Fri May 12 09:52:43 2017 +0100

    Merge remote-tracking branch 'zambal/elixir-highlighter'

commit a9deb7fbc8a6b6e68da6c145b52cb12637e69796
Merge: 7f541e58 120bf94e
Author: Maxime Coste <mawww@kakoune.org>
Date:   Fri May 12 09:51:30 2017 +0100

    Merge remote-tracking branch 'occivink/wrap-doc'