]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'lex' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 19 Sep 2009 17:06:57 +0000 (19:06 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 19 Sep 2009 17:06:57 +0000 (19:06 +0200)

Trivial merge