]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'fix-mark'
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Dec 2011 14:22:31 +0000 (14:22 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Dec 2011 14:22:31 +0000 (14:22 +0000)

Trivial merge