From: Samir Benmendil <samir.benmendil@gmail.com>
Date: Mon, 29 Sep 2014 18:58:28 +0000 (+0100)
Subject: Merge branch 'master' of tardis:/dotfiles
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/b1d09901486da9ebc8829419911be0400a63a6ef

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

b1d09901486da9ebc8829419911be0400a63a6ef