From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 20 Nov 2011 01:39:41 +0000 (+0100)
Subject: Merge remote branch 'asp/master'
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=bcf9899edea870018ffc19ab8f659ae98b0f6f85;p=config%2Fdotfiles.git

Merge remote branch 'asp/master'
---

bcf9899edea870018ffc19ab8f659ae98b0f6f85