From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 17 Jan 2012 23:39:04 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~140
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f32cc6f4ae3f92c63d2f738b69d84269be8549ab;p=i3%2Fi3

Merge branch 'master' into next
---

f32cc6f4ae3f92c63d2f738b69d84269be8549ab