From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Wed, 24 Dec 2014 15:14:02 +0000 (+0100)
Subject: Merge pull request #1980 from cmouse/update-yahttp-20141223
X-Git-Tag: rec-3.7.0-rc1~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd5d4b217d0862bfee0637a16eda97b3cd53f8d8;p=thirdparty%2Fpdns.git

Merge pull request #1980 from cmouse/update-yahttp-20141223

Sync with upstream
---

dd5d4b217d0862bfee0637a16eda97b3cd53f8d8