merge 6.2p1; reorder additions to monitor.h for easier merging in future

1 files changed, 2 insertions, 1 deletions

diff --git a/clientloop.h b/clientloop.h
index 3bb794879..d2baa0324 100644
--- a/clientloop.h
+++ b/clientloop.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.h,v 1.29 2011/09/09 22:46:44 djm Exp $ */
+/* $OpenBSD: clientloop.h,v 1.30 2012/08/17 00:45:45 dtucker Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -76,4 +76,5 @@ void	muxserver_listen(void);
 void    muxclient(const char *);
 void    mux_exit_message(Channel *, int);
 void    mux_tty_alloc_failed(Channel *);
+void    mux_master_session_cleanup_cb(int, void *);