Merge branch 'obsd-master'

Conflicts:
	server.c

server.c

@@ -155,7 +155,7 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
 	RB_INIT(&all_window_panes);
 	TAILQ_INIT(&clients);
 	RB_INIT(&sessions);
-	TAILQ_INIT(&session_groups);
+	RB_INIT(&session_groups);
 	key_bindings_init();
 
 	gettimeofday(&start_time, NULL);