]> jfr.im git - irc/quakenet/newserv.git/commitdiff
Merge.
authorGunnar Beutner <redacted>
Thu, 1 Aug 2013 16:00:41 +0000 (18:00 +0200)
committerGunnar Beutner <redacted>
Thu, 1 Aug 2013 16:00:41 +0000 (18:00 +0200)
--HG--
branch : shroudtrusts


Trivial merge