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

Merge branch 'master' into next
---

aa65b507ad107053a0d11989080dbc94b0f63d17