From: Michael Stapelberg <stapelberg@users.noreply.github.com>
Date: Fri, 25 Dec 2015 16:14:29 +0000 (+0100)
Subject: Merge pull request #2113 from Airblader/bug-2111
X-Git-Tag: 4.12~81
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=dc463077d62fc7f900b61f228042380623b39cf1;p=i3%2Fi3

Merge pull request #2113 from Airblader/bug-2111

Match on all criteria even if con_id or con_mark are given.
---

dc463077d62fc7f900b61f228042380623b39cf1