From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 3 Aug 2011 22:41:11 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~242
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=65ce6fe264306b4ca0bec09a42d204985c18da2b;p=i3%2Fi3

Merge branch 'master' into next
---

65ce6fe264306b4ca0bec09a42d204985c18da2b