From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 21 Nov 2011 19:56:00 +0000 (+0000)
Subject: Merge branch 'fix-focusin-dock'
X-Git-Tag: 4.1.1~34
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=402daf30b7efc1448cb70d71b18689be302a2783;p=i3%2Fi3

Merge branch 'fix-focusin-dock'
---

402daf30b7efc1448cb70d71b18689be302a2783