From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 9 Oct 2011 13:45:58 +0000 (+0100)
Subject: Merge branch 'i3bar-cleanup' into next
X-Git-Tag: 4.1~112
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f5953477922a35003fc530ac35aa40e97d72f727;p=i3%2Fi3

Merge branch 'i3bar-cleanup' into next
---

f5953477922a35003fc530ac35aa40e97d72f727