]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 8 Aug 2013 20:44:30 +0000 (22:44 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 8 Aug 2013 20:44:30 +0000 (22:44 +0200)

Trivial merge