]> jfr.im git - irc/rqf/shadowircd.git/commitdiff
Automated merge with ssh://hg.atheme.org//hg/charybdis
authorWilliam Pitcock <redacted>
Sun, 31 Jan 2010 01:21:28 +0000 (19:21 -0600)
committerWilliam Pitcock <redacted>
Sun, 31 Jan 2010 01:21:28 +0000 (19:21 -0600)

Trivial merge