Use sysconfdir for the location of global tmux.conf (but default it to /etc),
based on changes from Dagobert Michelsen.
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Rename global configuration define.
.Op Fl b not .Fl b for run-shell synopsis, from Ben Boeckel.
Use $(srcdir) for generating tmux.1, reported by fasta_ on IRC.
Don't limit width and height to 222 in standard mouse mode.
Rename tmux.1.in back to tmux.1 and generate tmux.1.{mdoc,man} instead.
RIS should reset focus reporting, from Hayaki Saito.
Reserve space for \0 in cmd_print, from George Nachman.
Don't let cursor position overflow when reflowing, from Christopher
Collins.
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code

Conflicts:
	Makefile.am
Merge branch 'obsd-master'

Conflicts:
	tmux.h