]> ruderich.org/simon Gitweb - config/dotfiles.git/commitdiff
Merge remote-tracking branch 'asp/master'
authorSimon Ruderich <simon@ruderich.org>
Thu, 27 Sep 2012 11:01:05 +0000 (13:01 +0200)
committerSimon Ruderich <simon@ruderich.org>
Thu, 27 Sep 2012 11:01:05 +0000 (13:01 +0200)
1  2 
gitconfig.m4

diff --cc gitconfig.m4
Simple merge