From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 12 Aug 2013 07:13:55 +0000 (+0200)
Subject: Merge branch 'fix-userguide'
X-Git-Tag: 4.7~72^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2fe2e005a09df96fa2d2e4b3ac2c5535996a7243;p=i3%2Fi3

Merge branch 'fix-userguide'
---

2fe2e005a09df96fa2d2e4b3ac2c5535996a7243