From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 5 Sep 2011 20:36:45 +0000 (+0200)
Subject: Merge branch 'clean-resize' into next
X-Git-Tag: 4.1~169
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=71b4fe9e601849d7e9fddec8d139f48e85a58db2;p=i3%2Fi3

Merge branch 'clean-resize' into next
---

71b4fe9e601849d7e9fddec8d139f48e85a58db2