From: Hiroshi Shirosaki Date: Thu, 3 Apr 2014 04:30:06 +0000 (+0900) Subject: Merge branch 'mapping' X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/893e8d81388f1c27368e963b61d34285d05f5a4b?hp=893e8d81388f1c27368e963b61d34285d05f5a4b Merge branch 'mapping' Conflicts: ftplugin/mkd.vim ---