From: Chris Porter <redacted>
Date: Mon, 25 Aug 2008 00:39:19 +0000 (+0100)
Subject: Merge.
X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/commitdiff_plain/36d16db46b18f30c568ce8f859f165ebf7eb3bc0

Merge.
---

36d16db46b18f30c568ce8f859f165ebf7eb3bc0