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

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

fefbc3d38436a07bc6ee216ccdf2d2c7ad88ecf5