Merge branch 'master' into feature/autocmd
authorDaniel Carl <danielcarl@gmx.de>
Wed, 3 Sep 2014 22:19:17 +0000 (00:19 +0200)
committerDaniel Carl <danielcarl@gmx.de>
Wed, 3 Sep 2014 22:19:17 +0000 (00:19 +0200)
commit87fc5bca3b8cfcab1440e08135468ac67e646bd2
tree50e7f4e5f437aa483f37176b4283db2a7de26c7e
parentf750207c2a8d021cb390c54a93b1f74140319e33
parente0d43522bd6a2ba9700c0ada11cef89dd865cc05
Merge branch 'master' into feature/autocmd

Conflicts:
src/ex.c
src/ex.c