]> jfr.im git - irc/rqf/shadowircd.git/commitdiff
Automated merge with ssh://hg.atheme.org//hg/charybdis
authorWilliam Pitcock <redacted>
Sun, 25 Oct 2009 02:07:53 +0000 (21:07 -0500)
committerWilliam Pitcock <redacted>
Sun, 25 Oct 2009 02:07:53 +0000 (21:07 -0500)

Trivial merge