From: Simon Ruderich <simon@ruderich.org>
Date: Wed, 18 May 2011 20:38:32 +0000 (+0200)
Subject: Merge remote branch 'asp/master'
X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=commitdiff_plain;h=80f9a7824fee91b661f53001c49e7a92a40a7395

Merge remote branch 'asp/master'
---

80f9a7824fee91b661f53001c49e7a92a40a7395