From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 23 Jan 2014 21:20:39 +0000 (+0100)
Subject: Merge branch 'userguide-reset'
X-Git-Tag: 4.7.2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=25faefa49835e741af68b47034b6097b43de8e1b;p=i3%2Fi3

Merge branch 'userguide-reset'
---

25faefa49835e741af68b47034b6097b43de8e1b