From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 26 Sep 2011 19:12:03 +0000 (+0100)
Subject: Merge branch 'fix-focus-ipc'
X-Git-Tag: 4.1~134^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6ce2f4d3948196153917d94686c9092c35bcd885;p=i3%2Fi3

Merge branch 'fix-focus-ipc'
---

6ce2f4d3948196153917d94686c9092c35bcd885