]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' of zekjur:/git/i3
authorMichael Stapelberg <michael+git@stapelberg.de>
Sun, 22 Feb 2009 23:18:48 +0000 (00:18 +0100)
committerMichael Stapelberg <michael+git@stapelberg.de>
Sun, 22 Feb 2009 23:18:48 +0000 (00:18 +0100)

Trivial merge