]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorAxel Wagner <mail@merovius.de>
Wed, 10 Aug 2011 21:56:16 +0000 (23:56 +0200)
committerAxel Wagner <mail@merovius.de>
Wed, 10 Aug 2011 21:56:16 +0000 (23:56 +0200)

Trivial merge