]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 9 Oct 2013 17:49:48 +0000 (19:49 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 9 Oct 2013 17:49:48 +0000 (19:49 +0200)

Trivial merge