From: splidge <redacted>
Date: Mon, 8 Mar 2010 14:38:48 +0000 (+0000)
Subject: Merge.
X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/commitdiff_plain/da53a1b3162ccd7726debe9d1b08e44dbbcd9f59

Merge.
---

da53a1b3162ccd7726debe9d1b08e44dbbcd9f59