From: Samir Benmendil <samir.benmendil@gmail.com>
Date: Thu, 18 Dec 2014 22:19:25 +0000 (+0100)
Subject: Merge branch 'master' of tardis:/dotfiles
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/5f0482e139faec62eb913d1ef4b0fc425dfb50ac

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

5f0482e139faec62eb913d1ef4b0fc425dfb50ac