]> jfr.im git - irc/quakenet/newserv.git/commitdiff
Merge.
authorChris Porter <redacted>
Thu, 25 Mar 2010 15:13:43 +0000 (15:13 +0000)
committerChris Porter <redacted>
Thu, 25 Mar 2010 15:13:43 +0000 (15:13 +0000)

Trivial merge