From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 17 Jan 2012 23:34:52 +0000 (+0000)
Subject: Merge branch 'fix-take-focus'
X-Git-Tag: 4.1.2~11
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e2b97a6fda34d746c7574eb4e3a9bf3a40c34f26;p=i3%2Fi3

Merge branch 'fix-take-focus'
---

e2b97a6fda34d746c7574eb4e3a9bf3a40c34f26