From: Chris Porter <redacted>
Date: Fri, 30 Nov 2007 20:42:12 +0000 (+0000)
Subject: Merge.
X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/commitdiff_plain/4303666a71c7bbe2f8061925e863182fbf6f33d8

Merge.
---

4303666a71c7bbe2f8061925e863182fbf6f33d8