From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 22 Oct 2011 16:02:49 +0000 (+0100)
Subject: Merge branch 'bar-config' into next
X-Git-Tag: 4.1~92
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d75560981e966713bc9bee1d33032dcfa2ff906f;p=i3%2Fi3

Merge branch 'bar-config' into next
---

d75560981e966713bc9bee1d33032dcfa2ff906f