]> ruderich.org/simon Gitweb - config/dotfiles.git/commitdiff
Merge remote branch 'rammstein/master'
authorSimon Ruderich <simon@ruderich.org>
Mon, 13 Sep 2010 15:33:28 +0000 (17:33 +0200)
committerSimon Ruderich <simon@ruderich.org>
Mon, 13 Sep 2010 15:33:28 +0000 (17:33 +0200)
1  2 
vimrc

diff --cc vimrc
Simple merge