From: Samir Benmendil <samir.benmendil@gmail.com>
Date: Sun, 24 Aug 2014 00:01:57 +0000 (+0100)
Subject: Merge branch 'master' of tardis:/dotfiles
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/fb657354cd3a63f8415f7ee4716903c18c5ed549

Merge branch 'master' of tardis:/dotfiles
---

fb657354cd3a63f8415f7ee4716903c18c5ed549