From: William Pitcock <redacted>
Date: Fri, 25 Apr 2008 19:46:46 +0000 (-0500)
Subject: Automated merge with ssh://hg.atheme.org//hg/charybdis
X-Git-Tag: charybdis-3.0.0~4
X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/commitdiff_plain/a7a27f1f800664728603ba05d725ecf19c115a95

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

a7a27f1f800664728603ba05d725ecf19c115a95