From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 22 Sep 2011 19:11:44 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~141
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1717b88174d26ed946bea0a0038a8a999fc2387f;p=i3%2Fi3

Merge branch 'master' into next
---

1717b88174d26ed946bea0a0038a8a999fc2387f