From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 27 Oct 2011 20:52:59 +0000 (+0100)
Subject: Merge branch 'move-floating' into next
X-Git-Tag: 4.1~40
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4330c723aeba4d982d06dbfd334de92fb04b43c0;p=i3%2Fi3

Merge branch 'move-floating' into next
---

4330c723aeba4d982d06dbfd334de92fb04b43c0