From: Samir Benmendil <samir.benmendil@gmail.com>
Date: Mon, 10 Jun 2013 00:33:14 +0000 (+0200)
Subject: Merge branch 'master' of tardis:/dotfiles
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/d86e7b0c1a72975b5a846f9329f53b0c5e238049?ds=sidebyside

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

d86e7b0c1a72975b5a846f9329f53b0c5e238049