]> jfr.im git - irc/quakenet/newserv.git/commitdiff
Merge.
authorChris Porter <redacted>
Sun, 22 Jan 2012 21:00:34 +0000 (21:00 +0000)
committerChris Porter <redacted>
Sun, 22 Jan 2012 21:00:34 +0000 (21:00 +0000)

Trivial merge