From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 17 Sep 2011 18:29:52 +0000 (+0100)
Subject: Merge branch 'floating-focus' into next
X-Git-Tag: 4.1~155
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4dc0a86fafdf0399eb6d1cdba95cc14ae5ed905b;p=i3%2Fi3

Merge branch 'floating-focus' into next
---

4dc0a86fafdf0399eb6d1cdba95cc14ae5ed905b