From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 28 May 2012 21:37:26 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.3~223
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1103f94c34ed874294ca493ab16566a70a4bc239;p=i3%2Fi3

Merge branch 'master' into next
---

1103f94c34ed874294ca493ab16566a70a4bc239