Merge branch 'master' into KeepConn
authorpk910 <philipp@zoelle1.de>
Mon, 12 Nov 2012 00:20:49 +0000 (01:20 +0100)
committerpk910 <philipp@zoelle1.de>
Mon, 12 Nov 2012 00:20:49 +0000 (01:20 +0100)
commitfa4486fe3e166152a57a42320fd1f2faee37b0c3
tree493f99aee79dad511a7968bec81161c0b7942af4
parenta61a0e5f88f306fcd264b65f8ff7c72aa1c78309
parent2fec862674d5b33145529ab0397640a2e4d516c7
Merge branch 'master' into KeepConn

Conflicts:
include/handlers.h
ircd/Makefile.in
include/handlers.h
include/msg.h
include/numeric.h
ircd/Makefile.in
ircd/parse.c
ircd/s_err.c
ircd/s_user.c