]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'fix-ipc-name'
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 15:40:15 +0000 (17:40 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 15:40:15 +0000 (17:40 +0200)

Trivial merge