From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 25 Jun 2012 19:44:20 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.3~200
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7afb33d8f8eee5da984a802f59553acbed66bd71;p=i3%2Fi3

Merge branch 'master' into next
---

7afb33d8f8eee5da984a802f59553acbed66bd71