From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 18 Sep 2011 13:39:33 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~151
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c88425147eb701114d9171ff0fcb6f161b9da9c1;p=i3%2Fi3

Merge branch 'master' into next
---

c88425147eb701114d9171ff0fcb6f161b9da9c1