From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 2 Aug 2011 20:32:37 +0000 (+0200)
Subject: Merge branch 'fix-resize-too-much' into next
X-Git-Tag: 4.0.2~65^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3fa361be2f7e0056b3ff19830977de07d0fd4595;p=i3%2Fi3

Merge branch 'fix-resize-too-much' into next
---

3fa361be2f7e0056b3ff19830977de07d0fd4595