From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 20 Sep 2011 21:37:08 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~142
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=143663f0317d4a5c527976aac59ada2b0f7d7cd6;p=i3%2Fi3

Merge branch 'master' into next
---

143663f0317d4a5c527976aac59ada2b0f7d7cd6