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

Merge branch 'master' into next
---

de7c2841ed362531f52e258bd36554d4a5fde07b