]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'fix-i3-with-shmlog'
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 23 Jan 2014 21:19:49 +0000 (22:19 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 23 Jan 2014 21:19:49 +0000 (22:19 +0100)

Trivial merge