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

Trivial merge