]> ruderich.org/simon Gitweb - config/dotfiles.git/commitdiff
Merge remote-tracking branch 'uni/master'
authorSimon Ruderich <simon@ruderich.org>
Fri, 11 Feb 2011 20:15:15 +0000 (21:15 +0100)
committerSimon Ruderich <simon@ruderich.org>
Fri, 11 Feb 2011 20:15:15 +0000 (21:15 +0100)
1  2 
shell/env

diff --cc shell/env
Simple merge