From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 8 Sep 2015 07:19:33 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.11~27
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=14a4e0c6f8500b981ed36b3e772c65c3ca35749d;p=i3%2Fi3

Merge branch 'master' into next
---

14a4e0c6f8500b981ed36b3e772c65c3ca35749d