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

Merge branch 'master' into next
---

4984b8128209de8bbd5ffb656b02f310f0a07974