From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 28 Aug 2011 16:17:25 +0000 (+0200)
Subject: Merge branch 'fix-wsnum' into next
X-Git-Tag: 4.1~176
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=44ae1b50ef7d32afc4b54817ebddb62b3c726b8a;p=i3%2Fi3

Merge branch 'fix-wsnum' into next
---

44ae1b50ef7d32afc4b54817ebddb62b3c726b8a