mirror of https://github.com/tmux/tmux.git
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Conflicts: TODO cmd-queue.c cmd-server-info.c cmd-wait-for.c tmux.1pull/1/head
commit
2fd0cb7600
Conflicts: TODO cmd-queue.c cmd-server-info.c cmd-wait-for.c tmux.1pull/1/head