]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 18 Mar 2013 21:45:55 +0000 (22:45 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 18 Mar 2013 21:45:55 +0000 (22:45 +0100)

Trivial merge