]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'logbuf' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 10 Dec 2011 11:35:37 +0000 (11:35 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 10 Dec 2011 11:35:37 +0000 (11:35 +0000)

Trivial merge