]> ruderich.org/simon Gitweb - config/dotfiles.git/commitdiff
Merge remote branch 'asp/master'
authorSimon Ruderich <simon@ruderich.org>
Wed, 18 May 2011 20:38:32 +0000 (22:38 +0200)
committerSimon Ruderich <simon@ruderich.org>
Wed, 18 May 2011 20:38:32 +0000 (22:38 +0200)

Trivial merge