]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorAxel Wagner <mail@merovius.de>
Thu, 23 Dec 2010 15:51:36 +0000 (16:51 +0100)
committerAxel Wagner <mail@merovius.de>
Thu, 23 Dec 2010 15:51:36 +0000 (16:51 +0100)

Trivial merge