Merge branch 'master' of v.licheni.net:stack/conf/vim