From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 20 Jan 2012 18:10:52 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~137
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=759ed0b6e3983bec11fab20c3174c95aac5c7a4d;p=i3%2Fi3

Merge branch 'master' into next
---

759ed0b6e3983bec11fab20c3174c95aac5c7a4d