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

Merge branch 'fix-mod-resizing'
---

1c6de74d4f6da572b95097ece4139070f2398881