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

Merge branch 'master' into next
---

eacbf986a00fc284ae19a7347b83441c16e6d004