From: Samir Benmendil <samir.benmendil@gmail.com>
Date: Fri, 26 Sep 2014 12:57:49 +0000 (+0100)
Subject: Merge branch 'master' into vim-clean
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/2c85158067da6cde66d4718c8436697304ad27d7?hp=--cc

Merge branch 'master' into vim-clean
---

2c85158067da6cde66d4718c8436697304ad27d7