From: Simon Ruderich Date: Fri, 25 Nov 2011 14:51:13 +0000 (+0100) Subject: Merge remote-tracking branch 'all-my-faults/master' X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=ce07eb6aef6f148babfe9df43bde9d857c97ea3b;p=config%2Fdotfiles.git Merge remote-tracking branch 'all-my-faults/master' Conflicts: vimrc --- ce07eb6aef6f148babfe9df43bde9d857c97ea3b