]> ruderich.org/simon Gitweb - config/dotfiles.git/commit
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)
commitce07eb6aef6f148babfe9df43bde9d857c97ea3b
tree0ca2e0f1bf865d55b4c821105ade74b32f1a13a1
parentc89813f8b9b316a181ce70cf6035206502eb4f74
parentb122832efa953ed888415f7a3959d4cbeae6e265
Merge remote-tracking branch 'all-my-faults/master'

Conflicts:
vimrc
vimrc