From: Attila Molnar <attilamolnar@hush.com>
Date: Wed, 10 Aug 2016 13:57:04 +0000 (+0200)
Subject: Merge branch 'master+websocket'
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=7770cd985405c7630e9149fc08c314ec824a9c75;p=user%2Fhenk%2Fcode%2Finspircd.git

Merge branch 'master+websocket'
---

7770cd985405c7630e9149fc08c314ec824a9c75