Merge branch 'master' of v.licheni.net:stack/conf/vim
authorstack <stack@inventati.org>
Mon, 18 Mar 2013 15:32:50 +0000 (16:32 +0100)
committerstack <stack@inventati.org>
Mon, 18 Mar 2013 15:32:50 +0000 (16:32 +0100)

Trivial merge