]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'displayversion'
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 30 Nov 2011 20:10:42 +0000 (20:10 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 30 Nov 2011 20:10:42 +0000 (20:10 +0000)

Trivial merge