From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 25 Aug 2011 12:11:48 +0000 (+0200)
Subject: Merge branch 'fix-userguide-namedws'
X-Git-Tag: 4.0.2~23
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=461e7ef505e8b6c86f20e0d3b10d4063835d7668;p=i3%2Fi3

Merge branch 'fix-userguide-namedws'
---

461e7ef505e8b6c86f20e0d3b10d4063835d7668