From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 10 Mar 2018 17:29:21 +0000 (+0100)
Subject: Merge branch 'release-4.15'
X-Git-Tag: 4.16~140
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b96529503feed211604c1b264282b0bf0b5fe3d8;p=i3%2Fi3

Merge branch 'release-4.15'
---

b96529503feed211604c1b264282b0bf0b5fe3d8