From: Chris Porter <redacted>
Date: Sat, 21 Feb 2009 14:01:12 +0000 (+0000)
Subject: Merge.
X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/commitdiff_plain/985016aa2571b59e165574ec061153cc95c1aefc

Merge.
---

985016aa2571b59e165574ec061153cc95c1aefc