From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 3 Oct 2011 18:31:09 +0000 (+0100)
Subject: Merge branch 'fix-i3bar-man'
X-Git-Tag: 4.1~124^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f4877773c39c5d254ba8efedfe3c39641ee8bb95;p=i3%2Fi3

Merge branch 'fix-i3bar-man'
---

f4877773c39c5d254ba8efedfe3c39641ee8bb95