From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 29 Nov 2011 22:37:08 +0000 (+0000)
Subject: Merge branch 'fix-nested-resize'
X-Git-Tag: 4.1.1~22
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bd3219ac6813970bd821f1b331809812d460874e;p=i3%2Fi3

Merge branch 'fix-nested-resize'
---

bd3219ac6813970bd821f1b331809812d460874e