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

Merge branch 'master' into next
---

37a40671c9b9317a621a5f82fd3780dae8a121a4