]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'release-4.12'
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 6 Mar 2016 15:17:27 +0000 (16:17 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 6 Mar 2016 15:17:27 +0000 (16:17 +0100)

Trivial merge