]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 29 Mar 2015 15:46:37 +0000 (17:46 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 29 Mar 2015 15:46:37 +0000 (17:46 +0200)

Trivial merge