From: pk910 <philipp@zoelle1.de>
Date: Mon, 12 Nov 2012 00:20:49 +0000 (+0100)
Subject: Merge branch 'master' into KeepConn
X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=commitdiff_plain;h=fa4486fe3e166152a57a42320fd1f2faee37b0c3

Merge branch 'master' into KeepConn

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

fa4486fe3e166152a57a42320fd1f2faee37b0c3
diff --cc include/handlers.h
index 19b64ce,2cb2954..79a052d
--- a/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 ircd/Makefile.in
index c336188,d007a8c..c9057a2
--- a/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 \