]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 27 Jun 2012 15:49:36 +0000 (17:49 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 27 Jun 2012 15:49:36 +0000 (17:49 +0200)

Trivial merge