]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'fix-tray-output'
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 14 Apr 2013 20:54:36 +0000 (22:54 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 14 Apr 2013 20:54:36 +0000 (22:54 +0200)

Trivial merge