From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 29 Jun 2013 18:28:07 +0000 (+0200)
Subject: Merge branch 'fix-floating-criteria'
X-Git-Tag: 4.6~12^2
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=e53b4108946c7be0515b5c17529d491b7aca2eef

Merge branch 'fix-floating-criteria'
---

e53b4108946c7be0515b5c17529d491b7aca2eef