From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 3 Aug 2011 12:49:23 +0000 (+0200)
Subject: Merge branch 'fix-floating-resize'
X-Git-Tag: 4.0.2~63
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=04a4d7c44a93d43f426c8400e83bbd6de5a167fb;p=i3%2Fi3

Merge branch 'fix-floating-resize'
---

04a4d7c44a93d43f426c8400e83bbd6de5a167fb