From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 3 Aug 2011 22:10:56 +0000 (+0200)
Subject: Merge branch 'fix-wsnum'
X-Git-Tag: 4.0.2~60
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8287a9429295678694f57b55f9b8c633aa60d5c7;p=i3%2Fi3

Merge branch 'fix-wsnum'
---

8287a9429295678694f57b55f9b8c633aa60d5c7