]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'fix-restart'
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 4 Aug 2011 21:37:34 +0000 (23:37 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 4 Aug 2011 21:37:34 +0000 (23:37 +0200)

Trivial merge