From: Chris Porter <redacted>
Date: Mon, 18 Jan 2016 22:28:29 +0000 (+0000)
Subject: Merge branch 'master' into chanserv-live
X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/commitdiff_plain/cd9baaa220c4afdfbbb25d4c4f6c8aa1f02fe637

Merge branch 'master' into chanserv-live
---

cd9baaa220c4afdfbbb25d4c4f6c8aa1f02fe637