From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 26 Nov 2011 22:17:58 +0000 (+0000)
Subject: Merge branch 'fix-dock-focus'
X-Git-Tag: 4.1.1~28
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=79dda6e57b6e919adab0d48efda8a7605957e074;p=i3%2Fi3

Merge branch 'fix-dock-focus'
---

79dda6e57b6e919adab0d48efda8a7605957e074