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

Merge branch 'fix-resize'
---

40ad2f182b14543abcaede14bd2c6c463f7aa0c3