From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 29 Jan 2012 18:02:44 +0000 (+0000)
Subject: Merge branch 'fix-floating-disappear'
X-Git-Tag: 4.2~99^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=714c8fcbe7f492327f77b47eba60a957068ca96a;p=i3%2Fi3

Merge branch 'fix-floating-disappear'
---

714c8fcbe7f492327f77b47eba60a957068ca96a