From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 21 Nov 2011 19:56:03 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~232
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=70151ea238926555ea9f80230f53069b8e5b143b;p=i3%2Fi3

Merge branch 'master' into next
---

70151ea238926555ea9f80230f53069b8e5b143b