]> ruderich.org/simon Gitweb - config/dotfiles.git/commit
Merge commit 'rammstein/master'
authorSimon Ruderich <simon@ruderich.org>
Tue, 16 Jun 2009 18:05:03 +0000 (20:05 +0200)
committerSimon Ruderich <simon@ruderich.org>
Tue, 16 Jun 2009 18:05:03 +0000 (20:05 +0200)
commit6f2cf38580db0de26020a1fc5bff4986c263cae9
tree806c68ab215fadaf60cbdd6d04800790dd60fff8
parented477ab1941771cf9a96ab54d7f8fea9ba05ac94
parent66aeeee1ce808a92a59f6ea4276c2eff069d1006
Merge commit 'rammstein/master'

Conflicts:

vimrc
vimrc