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

Merge branch 'master' into next
---

2eab8d7f2007d824de8aff6cde94d3eeb799c015