From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 4 Aug 2011 18:11:40 +0000 (+0200)
Subject: Merge branch 'fix-instance-criterion'
X-Git-Tag: 4.0.2~57
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8510a4e3220668c779d6b961f14fc79358188c2c;p=i3%2Fi3

Merge branch 'fix-instance-criterion'
---

8510a4e3220668c779d6b961f14fc79358188c2c