From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 7 Feb 2012 22:41:15 +0000 (-0500)
Subject: Merge branch 'fix-workspace_layout'
X-Git-Tag: 4.2~89^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b5d8ed1bed8364a020368b1c22a436a044c2b17c;p=i3%2Fi3

Merge branch 'fix-workspace_layout'
---

b5d8ed1bed8364a020368b1c22a436a044c2b17c