From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 14 Sep 2011 22:00:02 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~160
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ad568aa8c1d909e5e40cbc9e5a99900f8a1e0f2b;p=i3%2Fi3

Merge branch 'master' into next
---

ad568aa8c1d909e5e40cbc9e5a99900f8a1e0f2b