]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'i3bar-tray'
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 10 Jul 2012 20:53:36 +0000 (22:53 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 10 Jul 2012 20:53:36 +0000 (22:53 +0200)

Trivial merge