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

Merge branch 'fix-output-focus'
---

254299b4cdc8244cd3b0d9b8a00e0d02da2cce15