From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 9 Aug 2011 07:47:06 +0000 (+0200)
Subject: Merge branch 'fix-resize'
X-Git-Tag: 4.0.2~47
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=042b10e0681e5274f81fdaf0d25eb1aa5c145a78;p=i3%2Fi3

Merge branch 'fix-resize'
---

042b10e0681e5274f81fdaf0d25eb1aa5c145a78