]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into tree
authorAxel Wagner <mail@merovius.de>
Sun, 26 Dec 2010 14:27:32 +0000 (15:27 +0100)
committerAxel Wagner <mail@merovius.de>
Sun, 26 Dec 2010 14:27:32 +0000 (15:27 +0100)

Trivial merge