From: William Pitcock <redacted>
Date: Sat, 22 Dec 2007 22:06:35 +0000 (-0600)
Subject: Automated merge with ssh://hg.atheme.org//hg/charybdis
X-Git-Tag: charybdis-3.0.0-beta1~367
X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/commitdiff_plain/7b3c01255baea95810cb8e0abc9408bf6d5fddf6

Automated merge with ssh://hg.atheme.org//hg/charybdis
---

7b3c01255baea95810cb8e0abc9408bf6d5fddf6