From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 19 Mar 2012 20:42:08 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~52
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e7761a342bcbb6668e9cc710570f55be623c7373;p=i3%2Fi3

Merge branch 'master' into next
---

e7761a342bcbb6668e9cc710570f55be623c7373