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

Merge branch 'master' into next
---

22e30061f366400727bd746636be990db7cad89b