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

Merge branch 'master' into next
---

d3efa73dd7fe985aae8c9792f2201496745a018d