From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 18 Sep 2011 16:43:57 +0000 (+0100)
Subject: Merge branch 'fix-focus'
X-Git-Tag: 4.1~148^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=11ab7cf32ad80e548094192cb9bbff9e53dae1db;p=i3%2Fi3

Merge branch 'fix-focus'
---

11ab7cf32ad80e548094192cb9bbff9e53dae1db