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

Merge branch 'master' into next
---

afff328c59071afe03d1788f49c57587877380de