From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 29 Nov 2011 20:50:11 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~210
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=df2236c5ee5f4ad9f386c887e5f4d0647138a0ee;p=i3%2Fi3

Merge branch 'master' into next
---

df2236c5ee5f4ad9f386c887e5f4d0647138a0ee