]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'release-4.3' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 19 Sep 2012 16:12:35 +0000 (18:12 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 19 Sep 2012 16:12:35 +0000 (18:12 +0200)

Trivial merge