Merge branch 'master' into HostServ
authorpk910 <philipp@zoelle1.de>
Tue, 8 Jan 2013 02:59:14 +0000 (03:59 +0100)
committerpk910 <philipp@zoelle1.de>
Tue, 8 Jan 2013 02:59:14 +0000 (03:59 +0100)
1  2 
src/nickserv.c

diff --cc src/nickserv.c
Simple merge