From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 23 Aug 2011 22:57:36 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~210
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=642a7450047eb3bee29232ba93a3472b77932938;p=i3%2Fi3

Merge branch 'master' into next
---

642a7450047eb3bee29232ba93a3472b77932938