From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 26 Aug 2011 01:18:12 +0000 (+0200)
Subject: Merge branch 'fix-focus-parent'
X-Git-Tag: 4.0.2~18
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0b7e6d44b3d96982a7f2621954ff7424b32aa3bc;p=i3%2Fi3

Merge branch 'fix-focus-parent'
---

0b7e6d44b3d96982a7f2621954ff7424b32aa3bc