From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 28 Aug 2011 12:55:17 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~183
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f269d8523228fb98cb5bbbfd3ed8997a8c223eff;p=i3%2Fi3

Merge branch 'master' into next
---

f269d8523228fb98cb5bbbfd3ed8997a8c223eff