From: splidge <redacted>
Date: Mon, 10 Mar 2008 22:01:50 +0000 (+0000)
Subject: Merge.
X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/commitdiff_plain/7469ad7d024f39d8561d060714ceb6bc004ed699

Merge.
---

7469ad7d024f39d8561d060714ceb6bc004ed699