Merge remote branch 'upstream/master'
authorroot <root@mail.pk910.de>
Tue, 1 Nov 2011 21:02:19 +0000 (22:02 +0100)
committerroot <root@mail.pk910.de>
Tue, 1 Nov 2011 21:02:19 +0000 (22:02 +0100)
commite4427641a86ef4b3d8336133db350ca359650ef2
tree54bc146f887b339e12b1f5eae11faf93d84dd26e
parentbcf21f277cae5376d09808ef67c1bc0da30a2012
parent3c70e89e7cc738f30cfbd1a5530507af41fc9ed6
Merge remote branch 'upstream/master'
src/chanserv.c
src/helpfile.c
src/mod-helpserv.c
src/modcmd.c
src/nickserv.c
src/proto-p10.c