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

Merge branch 'master' into next
---

a57a2b9ccb85cd5045c862901f775603ba5cff00