]> ruderich.org/simon Gitweb - config/dotfiles.git/commit
Merge commit 'rammstein/master'
authorSimon Ruderich <simon@ruderich.org>
Sat, 14 Nov 2009 13:57:43 +0000 (14:57 +0100)
committerSimon Ruderich <simon@ruderich.org>
Sat, 14 Nov 2009 13:57:43 +0000 (14:57 +0100)
commit0928bfd75c45c99dcef44ccf85c29574a2d25c3f
treebc3eed4aa873aec57c9e029345885be4dd82d872
parent3e0ab38cf913c3947750e1033d54cf0e163a3602
parent011957a689c77df4dc695d4a06f92e0e40d021c8
Merge commit 'rammstein/master'

Conflicts:
vimrc
vimrc