From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 4 Sep 2017 05:53:39 +0000 (+0200)
Subject: Merge branch 'release-4.14'
X-Git-Tag: 4.14.1~73^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ef34b2759ff8c8a3d7147054d0dcf6f5c92649c3;p=i3%2Fi3

Merge branch 'release-4.14'
---

ef34b2759ff8c8a3d7147054d0dcf6f5c92649c3