From: Chris Porter <redacted>
Date: Thu, 13 Mar 2008 00:11:35 +0000 (+0000)
Subject: Merge.
X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/commitdiff_plain/805356002446a46862485586066e63c3aab42452

Merge.
---

805356002446a46862485586066e63c3aab42452