]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'fix-i3bar-dying-tray'
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 22 Apr 2012 18:11:07 +0000 (20:11 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 22 Apr 2012 18:11:07 +0000 (20:11 +0200)

Trivial merge