From: Chris Porter <redacted>
Date: Sun, 12 Oct 2008 22:04:29 +0000 (+0100)
Subject: Merge.
X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/commitdiff_plain/6786e303406a9724a202c2b2438fadaf7645da26

Merge.
---

6786e303406a9724a202c2b2438fadaf7645da26