]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'role-criterion' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Sep 2011 15:10:05 +0000 (16:10 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Sep 2011 15:10:05 +0000 (16:10 +0100)

Trivial merge