]> ruderich.org/simon Gitweb - config/dotfiles.git/commitdiff
Merge remote branch 'asp/master'
authorSimon Ruderich <simon@ruderich.org>
Sun, 20 Nov 2011 01:39:41 +0000 (02:39 +0100)
committerSimon Ruderich <simon@ruderich.org>
Sun, 20 Nov 2011 01:39:41 +0000 (02:39 +0100)

Trivial merge