]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'hacking-howto' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 23 Nov 2011 21:54:52 +0000 (21:54 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 23 Nov 2011 21:54:52 +0000 (21:54 +0000)

Trivial merge