From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 8 Jan 2012 12:30:41 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~150
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f88c77945744565c1b637d8fcaab271312bf1a1c;p=i3%2Fi3

Merge branch 'master' into next
---

f88c77945744565c1b637d8fcaab271312bf1a1c