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

Merge branch 'master' into next
---

97a5fb2ec0ef410858f1e9755275c06280967c6d