]> jfr.im git - irc/quakenet/newserv.git/commitdiff
Merge branch 'master' into chanserv-live
authorChris Porter <redacted>
Mon, 18 Jan 2016 22:28:29 +0000 (22:28 +0000)
committerChris Porter <redacted>
Mon, 18 Jan 2016 22:28:29 +0000 (22:28 +0000)

Trivial merge