]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'fix-reload-assignments' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 11 Sep 2011 22:42:12 +0000 (23:42 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 11 Sep 2011 22:42:12 +0000 (23:42 +0100)

Trivial merge