From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 12 Aug 2011 21:10:21 +0000 (+0200)
Subject: Merge branch 'i3bar-fixes'
X-Git-Tag: 4.0.2~43
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c8e6de1382dde60a3221d55d5351509007b446d0;p=i3%2Fi3

Merge branch 'i3bar-fixes'
---

c8e6de1382dde60a3221d55d5351509007b446d0