From: Chris Porter <redacted>
Date: Fri, 30 May 2008 22:53:44 +0000 (+0100)
Subject: Merge.
X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/commitdiff_plain/e3b3b3f33be457cf03a56cc918ce50eb3286697d

Merge.
---

e3b3b3f33be457cf03a56cc918ce50eb3286697d