From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 2 Oct 2011 11:57:25 +0000 (+0100)
Subject: Merge branch 'userguide-mark'
X-Git-Tag: 4.1~130^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=454cc746d75b3931a837dab5ac65d53ac5524a3a;p=i3%2Fi3

Merge branch 'userguide-mark'
---

454cc746d75b3931a837dab5ac65d53ac5524a3a