From: Patrick Monnerat <patrick.monnerat@dh.com>
Date: Mon, 8 Feb 2016 13:52:18 +0000 (+0100)
Subject: Merge branch 'master' of github.com:curl/curl
X-Git-Tag: curl-7_48_0~170
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4303fd5bb26c54a90a8e1ab4380f615995dd0c6;p=thirdparty%2Fcurl.git

Merge branch 'master' of github.com:curl/curl
---

c4303fd5bb26c54a90a8e1ab4380f615995dd0c6