From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 15 Apr 2013 19:01:27 +0000 (+0200)
Subject: Merge branch 'fix-resize'
X-Git-Tag: 4.6~44^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=423f2e264f6bff6a203465dfa3bec87e46caac27;p=i3%2Fi3

Merge branch 'fix-resize'
---

423f2e264f6bff6a203465dfa3bec87e46caac27