Merge remote branch 'upstream/master'
authorroot <root@mail.pk910.de>
Wed, 9 Nov 2011 15:27:40 +0000 (16:27 +0100)
committerroot <root@mail.pk910.de>
Wed, 9 Nov 2011 15:27:40 +0000 (16:27 +0100)
commita1607b87da7b66314f864f272b9806f4b0fe8169
treeaa2dae3c2c2090027872c353350dad85a3b82759
parent7543b416b3e2b5c1646d2da43cef3008c15d469a
parentffcb5269fdd500f1f7b1603fa9442115d8df3d4b
Merge remote branch 'upstream/master'

Conflicts:
src/chanserv.c
src/chanserv.c