From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 15 Mar 2014 17:05:45 +0000 (+0100)
Subject: Merge branch 'fix-resize'
X-Git-Tag: 4.8~99^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ed158d125934a4093bbb4c402248e00431507453;p=i3%2Fi3

Merge branch 'fix-resize'
---

ed158d125934a4093bbb4c402248e00431507453