From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 18 Sep 2011 15:10:05 +0000 (+0100)
Subject: Merge branch 'role-criterion' into next
X-Git-Tag: 4.1~150
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=14dd8302703fd652cc61a9d0cc2962d5ea2e178d;p=i3%2Fi3

Merge branch 'role-criterion' into next
---

14dd8302703fd652cc61a9d0cc2962d5ea2e178d