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

Merge branch 'master' into next
---

e9395149b9cac66606ecbbc3166a2151a9b6469f