From: JamJar00 <jamster.30@btinternet.com>
Date: Tue, 3 Jan 2017 16:39:47 +0000 (+0000)
Subject: Merge branch 'master' of https://github.com/DarkRiftNetworking/Hazel-Networking.git
X-Git-Tag: 1.0.0~112
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=36b45323d600518938e469e6fad10a94a2630a97;p=rhonda%2Fimpostor.hazel.git

Merge branch 'master' of https://github.com/DarkRiftNetworking/Hazel-Networking.git
---

36b45323d600518938e469e6fad10a94a2630a97