]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 16 Apr 2015 07:03:28 +0000 (09:03 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 16 Apr 2015 07:03:28 +0000 (09:03 +0200)

Trivial merge