From: Chris Porter <redacted>
Date: Mon, 18 Aug 2014 19:45:30 +0000 (+0100)
Subject: Merge.
X-Git-Url: https://jfr.im/git/irc/quakenet/qwebirc.git/commitdiff_plain/52f5b0e37b783d6e0926fce4f9a8e4f8e315c738

Merge.
---

52f5b0e37b783d6e0926fce4f9a8e4f8e315c738