From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 20 Jan 2012 18:14:12 +0000 (+0000)
Subject: Merge branch 'fix-xcb-compat'
X-Git-Tag: 4.1.2~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=af97a3e56dd71c7f0c173c172fc8681a74d6e0f3;p=i3%2Fi3

Merge branch 'fix-xcb-compat'
---

af97a3e56dd71c7f0c173c172fc8681a74d6e0f3