From: Aurélien Aptel <aurelien.aptel@gmail.com>
Date: Fri, 26 Nov 2010 21:12:54 +0000 (+0100)
Subject: merge.
X-Git-Url: https://jasonwoof.com/gitweb/?p=st.git;a=commitdiff_plain;h=41a4497ecfa66c1dbc65202ae80542c18c5d7793

merge.
---

41a4497ecfa66c1dbc65202ae80542c18c5d7793