From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 28 May 2012 21:37:22 +0000 (+0200)
Subject: Merge branch 'tests-focus-parent-child'
X-Git-Tag: 4.3~223^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=24b1fcfd1a77520afbaf3b65b36174e821ac5589;p=i3%2Fi3

Merge branch 'tests-focus-parent-child'
---

24b1fcfd1a77520afbaf3b65b36174e821ac5589