From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 11 Sep 2011 21:52:41 +0000 (+0100)
Subject: Merge branch 'fix-empty-criteria'
X-Git-Tag: 4.1~164^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=67cf46fa62095051cfa46a1e0c930afc47a9ed42;p=i3%2Fi3

Merge branch 'fix-empty-criteria'
---

67cf46fa62095051cfa46a1e0c930afc47a9ed42