From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 7 Mar 2015 14:40:59 +0000 (+0100)
Subject: Merge branch 'dont-match-placeholders'
X-Git-Tag: 4.9.1~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=53b621f1aa4ff9f5d18ac5de7e78735bf158545b;p=i3%2Fi3

Merge branch 'dont-match-placeholders'
---

53b621f1aa4ff9f5d18ac5de7e78735bf158545b