From: Ingo Bürk <admin@airblader.de>
Date: Sat, 10 Mar 2018 20:37:53 +0000 (+0100)
Subject: Merge pull request #3170 from stapelberg/master-merge
X-Git-Tag: 4.16.1~11
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=74c0e1b8664b11e5b1afb34501c03bcec43bfa2a;p=i3%2Fi3

Merge pull request #3170 from stapelberg/master-merge

Fix incorrect merge *sigh*
---

74c0e1b8664b11e5b1afb34501c03bcec43bfa2a