From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 27 Aug 2011 13:28:31 +0000 (+0200)
Subject: Merge branch 'fix-userguide'
X-Git-Tag: 4.0.2~11
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=47ae4d4f6659b4473c29216980e7b5ddb45e9eb9;p=i3%2Fi3

Merge branch 'fix-userguide'
---

47ae4d4f6659b4473c29216980e7b5ddb45e9eb9