From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 1 Aug 2011 13:55:21 +0000 (+0200)
Subject: Merge i3bar into next
X-Git-Tag: 4.0.1~7
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=22bac9fd9a6b3a2bf12aea124c519e2c9f22f855;p=i3%2Fi3

Merge i3bar into next
---

22bac9fd9a6b3a2bf12aea124c519e2c9f22f855