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

Merge branch 'master' into next
---

af810df8da471e49fbf592c215f49f2ee8d2e1a5