From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 17 Sep 2011 23:40:42 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~153
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0bc44ffc37401fadbe0a2deb08fea2bd7174d6e7;p=i3%2Fi3

Merge branch 'master' into next
---

0bc44ffc37401fadbe0a2deb08fea2bd7174d6e7