From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 4 Nov 2018 13:47:46 +0000 (+0100)
Subject: Merge branch 'release-4.16'
X-Git-Tag: 4.16.1~9^2
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=3ae8a45c56e5cb32a3f2d94d6588c3026a9898ee

Merge branch 'release-4.16'
---

3ae8a45c56e5cb32a3f2d94d6588c3026a9898ee