Merge branch 'master' into KeepConn

Conflicts:
	include/handlers.h
	ircd/Makefile.in

diff --cc include/handlers.h
index 19b64ceb1d8adab8b81701c8d3b5ef471279cdd3,2cb2954543122501df4c1378594e18cfc161688a..79a052d913e9be4b63bbe11170f91d030e83ac31
--- 1/include/handlers.h
--- 2/include/handlers.h
+++ b/include/handlers.h
@@@ -236,7 -236,7 +237,8 @@@ extern int ms_svsjoin(struct Client*, s
  extern int ms_svspart(struct Client*, struct Client*, int, char*[]);
  extern int ms_topic(struct Client*, struct Client*, int, char*[]);
  extern int ms_trace(struct Client*, struct Client*, int, char*[]);
 +extern int ms_unzombie(struct Client*, struct Client*, int, char*[]);
+ extern int ms_uninvite(struct Client*, struct Client*, int, char*[]);
  extern int ms_uping(struct Client*, struct Client*, int, char*[]);
  extern int ms_version(struct Client*, struct Client*, int, char*[]);
  extern int ms_wallchops(struct Client*, struct Client*, int, char*[]);

diff --cc include/msg.h
Simple merge

diff --cc include/numeric.h
Simple merge

diff --cc ircd/Makefile.in
index c3361889b420c1336be6d78935c9f45baba34910,d007a8c1f3e3fccda42d65744f25bba07b96f559..c9057a28a12fc2129d9b1443546b05a7d66df13a
--- 1/ircd/Makefile.in
--- 2/ircd/Makefile.in
+++ b/ircd/Makefile.in
@@@ -180,7 -179,7 +180,8 @@@ IRCD_SRC = 
        m_time.c \
        m_topic.c \
        m_trace.c \
 +      m_unzombie.c \
+       m_uninvite.c \
        m_uping.c \
        m_user.c \
        m_userhost.c \

diff --cc ircd/parse.c
Simple merge

diff --cc ircd/s_err.c
Simple merge

diff --cc ircd/s_user.c
Simple merge