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

Merge branch 'master' into next
---

e09e077b763bb1ff1975998c87d017afa9c319c3