]> jfr.im git - irc/quakenet/newserv.git/commitdiff
Merge.
authorChris Porter <redacted>
Fri, 2 Sep 2011 21:56:29 +0000 (22:56 +0100)
committerChris Porter <redacted>
Fri, 2 Sep 2011 21:56:29 +0000 (22:56 +0100)

Trivial merge