From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 19 Sep 2011 18:20:16 +0000 (+0100)
Subject: Merge branch 'fix-i3bar-x11'
X-Git-Tag: 4.1~147^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=181bd6008ddb7165429489b214c38a65d9f02dc8;p=i3%2Fi3

Merge branch 'fix-i3bar-x11'
---

181bd6008ddb7165429489b214c38a65d9f02dc8