From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 30 Nov 2011 20:34:49 +0000 (+0000)
Subject: Merge branch 'noworkarea'
X-Git-Tag: 4.1.1~20
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=70e6ba1d0b0ee77abaed26e4ce73c361fbec088e;p=i3%2Fi3

Merge branch 'noworkarea'
---

70e6ba1d0b0ee77abaed26e4ce73c361fbec088e