From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 24 Sep 2017 17:21:41 +0000 (+0200)
Subject: Merge branch 'release-4.14.1'
X-Git-Tag: 4.16.1~14
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2eca0f02878d054b32b4f3afbe32bf52848f3e44;p=i3%2Fi3

Merge branch 'release-4.14.1'
---

2eca0f02878d054b32b4f3afbe32bf52848f3e44