From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 18 Dec 2011 15:18:47 +0000 (+0000)
Subject: Merge branch 'fix-float-resize'
X-Git-Tag: 4.1.1~10
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=59a694edea13ebf84031bb02dfa6b7b97cf5b5e3;p=i3%2Fi3

Merge branch 'fix-float-resize'
---

59a694edea13ebf84031bb02dfa6b7b97cf5b5e3