]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' of zekjur:/git/i3
authorMichael Stapelberg <michael+git@stapelberg.de>
Wed, 25 Feb 2009 00:44:59 +0000 (01:44 +0100)
committerMichael Stapelberg <michael+git@stapelberg.de>
Wed, 25 Feb 2009 00:44:59 +0000 (01:44 +0100)

Trivial merge