]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 25 Jun 2014 08:00:59 +0000 (10:00 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 25 Jun 2014 08:00:59 +0000 (10:00 +0200)

Trivial merge