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

Merge branch 'userguide'
---

17c0ec19b2564a0a4706d2e225e8e09e4bb8686d