From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 17 Aug 2011 10:29:12 +0000 (+0200)
Subject: Merge branch 'fix-wsnext'
X-Git-Tag: 4.0.2~39
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4f0a3fd1ba41b11e8b4907745048d4be00bbed2c;p=i3%2Fi3

Merge branch 'fix-wsnext'
---

4f0a3fd1ba41b11e8b4907745048d4be00bbed2c