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

Merge pull request #3171 from i3/revert-3170-master-merge

Partially revert "Fix incorrect merge *sigh*"
---

c54f5008395b10c046f380cc3069ff779e5d2877