From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 28 Aug 2011 12:55:14 +0000 (+0200)
Subject: Merge branch 'userguide-wrapping'
X-Git-Tag: 4.0.2~9
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3380f76310ea2f8b0e623f8fae99ad9f973598c8;p=i3%2Fi3

Merge branch 'userguide-wrapping'
---

3380f76310ea2f8b0e623f8fae99ad9f973598c8