]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'i3bar-tray-size' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 9 Oct 2011 12:52:05 +0000 (13:52 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 9 Oct 2011 12:52:05 +0000 (13:52 +0100)

Trivial merge