]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'i3-input-fmt' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Sep 2011 12:58:08 +0000 (13:58 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Sep 2011 12:58:08 +0000 (13:58 +0100)

Trivial merge