From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 2 Apr 2013 21:59:48 +0000 (+0200)
Subject: Merge branch 'fix-floating-size'
X-Git-Tag: 4.6~57^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4f72c5c5fc62a8ff4ed0bfc177ca53058581295a;p=i3%2Fi3

Merge branch 'fix-floating-size'
---

4f72c5c5fc62a8ff4ed0bfc177ca53058581295a