]> git.rmz.io Git - dotfiles.git/commitdiff
Merge branch 'master' of tardis:/dotfiles
authorSamir Benmendil <samir.benmendil@gmail.com>
Mon, 10 Jun 2013 00:33:14 +0000 (02:33 +0200)
committerSamir Benmendil <samir.benmendil@gmail.com>
Mon, 10 Jun 2013 00:33:14 +0000 (02:33 +0200)
1  2 
zshrc

diff --cc zshrc
Simple merge