]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'release-4.7.1' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 21 Jan 2014 18:22:43 +0000 (19:22 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 21 Jan 2014 18:22:43 +0000 (19:22 +0100)

Trivial merge