From: Chris Porter <redacted>
Date: Sat, 7 Mar 2009 13:48:45 +0000 (+0000)
Subject: Merge.
X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/commitdiff_plain/814b70d3a90dcd09f0af8b61d9682ea71b9ae923

Merge.
---

814b70d3a90dcd09f0af8b61d9682ea71b9ae923