]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'i3bar-systray' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 23 Aug 2011 23:18:55 +0000 (01:18 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 23 Aug 2011 23:18:55 +0000 (01:18 +0200)

Trivial merge