From: Amand Tihon <amand.tihon@iba-group.com>
Date: Fri, 24 Aug 2012 13:10:16 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://syrtis.alrj.org/srv/git/zsh.d
X-Git-Url: https://git.alrj.org/?p=zsh.d.git;a=commitdiff_plain;h=4580f8f75eb2516256e46ffb334cfb55e72bb851

Merge branch 'master' of git+ssh://syrtis.alrj.org/srv/git/zsh.d
---

4580f8f75eb2516256e46ffb334cfb55e72bb851