]> git.rmz.io Git - dotfiles.git/commitdiff
Merge branch 'master' of tardis:/dotfiles
authorSamir Benmendil <samir.benmendil@gmail.com>
Thu, 4 Dec 2014 23:15:31 +0000 (23:15 +0000)
committerSamir Benmendil <samir.benmendil@gmail.com>
Thu, 4 Dec 2014 23:15:31 +0000 (23:15 +0000)
1  2 
vim/vimrc

diff --cc vim/vimrc
Simple merge