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

Trivial merge