]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'release-4.2'
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 25 Apr 2012 21:30:18 +0000 (23:30 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 25 Apr 2012 21:30:18 +0000 (23:30 +0200)

Trivial merge