From: Simon Ruderich <simon@ruderich.org>
Date: Thu, 27 Sep 2012 11:01:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'asp/master'
X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=commitdiff_plain;h=3a96a98016c6a80df2686c2061663645092f1808

Merge remote-tracking branch 'asp/master'
---

3a96a98016c6a80df2686c2061663645092f1808