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

Merge branch 'master' into next
---

7a22bd1cf3b8cdc3694084f311c405997103d391