From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 25 Jun 2012 19:44:07 +0000 (+0200)
Subject: Merge branch 'fix-C'
X-Git-Tag: 4.3~200^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=28d453a2761e599fa2430a93111a8b348b2f2e57;p=i3%2Fi3

Merge branch 'fix-C'
---

28d453a2761e599fa2430a93111a8b348b2f2e57