From: Chris Porter <redacted>
Date: Wed, 12 Mar 2008 19:19:21 +0000 (+0000)
Subject: Merge.
X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/commitdiff_plain/fa104bcfb9f85894b9c45f18049290a022ea31d0

Merge.
---

fa104bcfb9f85894b9c45f18049290a022ea31d0