]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'bar-config' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 22 Oct 2011 16:02:49 +0000 (17:02 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 22 Oct 2011 16:02:49 +0000 (17:02 +0100)

Trivial merge