]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 30 Jan 2013 12:30:59 +0000 (13:30 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 30 Jan 2013 12:30:59 +0000 (13:30 +0100)

Trivial merge