From: Peter van Dijk <peter@7bits.nl>
Date: Tue, 28 Jan 2014 06:57:20 +0000 (-0800)
Subject: Merge pull request #1238 from zeha/f/ws
X-Git-Tag: rec-3.6.0-rc1~217
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de1a33e089b259b3b27bcf86e8f9e29e8b142fa7;p=thirdparty%2Fpdns.git

Merge pull request #1238 from zeha/f/ws

Webserver Updates
---

de1a33e089b259b3b27bcf86e8f9e29e8b142fa7