From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 8 Aug 2014 18:16:40 +0000 (+0200)
Subject: Merge branch 'fix-layout-focus'
X-Git-Tag: 4.9~59^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fa41ad7e218d1497a749eb59983f3dd162ddbe29;p=i3%2Fi3

Merge branch 'fix-layout-focus'
---

fa41ad7e218d1497a749eb59983f3dd162ddbe29