From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 23 Aug 2011 19:32:56 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~211
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b28457f66380484093d03236e8635a15e4d855bf;p=i3%2Fi3

Merge branch 'master' into next
---

b28457f66380484093d03236e8635a15e4d855bf