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

Merge branch 'master' into next
---

abafb2b235102ea561c632391ad525f7e1c9e148