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

Merge branch 'master' into next
---

0c51b57b992ac3ea5c14480d971d826d588cf865