From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 27 Jan 2013 19:20:53 +0000 (+0100)
Subject: Merge branch 'userguide-resize'
X-Git-Tag: 4.5~32^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aede5600aa8a16a5464005193f5b8958dc0472d7;p=i3%2Fi3

Merge branch 'userguide-resize'
---

aede5600aa8a16a5464005193f5b8958dc0472d7