From: Valeriy Yatsko <redacted>
Date: Sun, 21 Dec 2008 23:47:00 +0000 (+0300)
Subject: Automated merge with ssh://hg.atheme.org//hg/charybdis
X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/commitdiff_plain/bc647d1d88644f12b86ab8cc2cefb719b5ec1875?ds=sidebyside

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

bc647d1d88644f12b86ab8cc2cefb719b5ec1875