]> git.rmz.io Git - dotfiles.git/commitdiff
Merge branch 'master' of tardis:dotfiles
authorSamir Benmendil <samir.benmendil@gmail.com>
Thu, 29 Jan 2015 15:50:17 +0000 (15:50 +0000)
committerSamir Benmendil <samir.benmendil@gmail.com>
Thu, 29 Jan 2015 15:50:17 +0000 (15:50 +0000)
1  2 
vim/vimrc

diff --cc vim/vimrc
Simple merge