From: Chris Porter <redacted>
Date: Fri, 5 Jun 2009 00:27:45 +0000 (+0100)
Subject: Merge.
X-Git-Url: https://jfr.im/git/irc/quakenet/qwebirc.git/commitdiff_plain/c8bfbafdeba4b9d568f04dd2354d139613c0054e

Merge.
---

c8bfbafdeba4b9d568f04dd2354d139613c0054e