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

Merge branch 'master' into next
---

ff85023b0862126958d3db5d1acaf3cb2229459b