From: Aurélien Aptel <aurelien.aptel@gmail.com>
Date: Mon, 13 Feb 2012 00:01:41 +0000 (+0100)
Subject: merge
X-Git-Tag: 0.2.1~8
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=45971204a23deca8b4b339b85816bebc424d26e5;p=st.git

merge
---

45971204a23deca8b4b339b85816bebc424d26e5