]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 27 Aug 2013 18:23:00 +0000 (20:23 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 27 Aug 2013 18:23:00 +0000 (20:23 +0200)

Trivial merge