]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 14 Mar 2013 14:20:34 +0000 (15:20 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 14 Mar 2013 14:20:34 +0000 (15:20 +0100)

Trivial merge