]> jfr.im git - irc/rqf/shadowircd.git/commitdiff
Automated merge with ssh://hg.atheme.org//hg/charybdis
authorWilliam Pitcock <redacted>
Sun, 17 Aug 2008 12:53:32 +0000 (07:53 -0500)
committerWilliam Pitcock <redacted>
Sun, 17 Aug 2008 12:53:32 +0000 (07:53 -0500)
1  2 
src/messages.tab

Simple merge