]> ruderich.org/simon Gitweb - config/dotfiles.git/commitdiff
Merge remote-tracking branch 'all-my-faults/master'
authorSimon Ruderich <simon@ruderich.org>
Fri, 25 Nov 2011 14:51:13 +0000 (15:51 +0100)
committerSimon Ruderich <simon@ruderich.org>
Fri, 25 Nov 2011 14:51:13 +0000 (15:51 +0100)
Conflicts:
vimrc


No differences found