From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 17 Oct 2011 22:35:19 +0000 (+0100)
Subject: Merge branch 'workspace_baf' into next
X-Git-Tag: 4.1~96
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=744def377a601381ab649f5e39a243a6fc042172;p=i3%2Fi3

Merge branch 'workspace_baf' into next
---

744def377a601381ab649f5e39a243a6fc042172