From: Matthias-Christian Ott <ott@enolink.de>
Date: Thu, 10 Jul 2008 20:43:24 +0000 (+0200)
Subject: merge with backout head
X-Git-Tag: 0.1~147
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=399355740410695859db7f7816fd906a27427fad;p=st.git

merge with backout head
---

399355740410695859db7f7816fd906a27427fad