]> git.sur5r.net Git - i3/i3/commitdiff
Merge i3bar into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 1 Aug 2011 13:55:21 +0000 (15:55 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 1 Aug 2011 13:55:27 +0000 (15:55 +0200)

Trivial merge