From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 17 Dec 2011 18:47:53 +0000 (+0000)
Subject: Merge branch 'fix-resize-focus'
X-Git-Tag: 4.1.1~12
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7daac508077749bf0bd76dcedf3e836407c34a74;p=i3%2Fi3

Merge branch 'fix-resize-focus'
---

7daac508077749bf0bd76dcedf3e836407c34a74