From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 4 Aug 2011 21:37:40 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~238
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6e95004d6cb2e6dd2f342cef4c51b1d2fc8de3f9;p=i3%2Fi3

Merge branch 'master' into next
---

6e95004d6cb2e6dd2f342cef4c51b1d2fc8de3f9