From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 6 Aug 2011 16:54:50 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~236
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=94ba65579494b6780702b1a724c5befa6e0f5a13;p=i3%2Fi3

Merge branch 'master' into next
---

94ba65579494b6780702b1a724c5befa6e0f5a13