]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 28 May 2013 17:56:57 +0000 (19:56 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 28 May 2013 17:56:57 +0000 (19:56 +0200)

Trivial merge