Merge branch 'obsd-master'

Conflicts:
	Makefile
	tmux.1
	window.c

1 files changed, 1 insertions, 1 deletions

diff --git a/server.c b/server.c
index f372de4f..c8bc7edd 100644
--- a/server.c
+++ b/server.c
@@ -217,7 +217,7 @@ server_loop(void)
 	}
 }
 
-/* Check if the server should be shutting down (no more clients or sessions). */
+/* Check if the server should exit (no more clients or sessions). */
 int
 server_should_shutdown(void)
 {