From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 8 Jan 2012 12:03:31 +0000 (+0000)
Subject: Merge branch 'focus-output' into next
X-Git-Tag: 4.2~151
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d662ba3c0c0537a33244f6a8c7298d38bfc8e19a;hp=-c;p=i3%2Fi3

Merge branch 'focus-output' into next
---

d662ba3c0c0537a33244f6a8c7298d38bfc8e19a