From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 5 Sep 2011 20:25:48 +0000 (+0200)
Subject: Merge branch 'fix-wsnum' into next
X-Git-Tag: 4.1~170
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0a42a164296c60deabc9d79636b09ebd28d458cc;p=i3%2Fi3

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

0a42a164296c60deabc9d79636b09ebd28d458cc