From: Patrick Monnerat <pm@datasphere.ch>
Date: Mon, 15 Jul 2013 14:55:30 +0000 (+0200)
Subject: Merge branch 'master' of github.com:bagder/curl
X-Git-Tag: curl-7_32_0~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=695931cf8e38da79a987ac65dc2408c7c20612c1;p=thirdparty%2Fcurl.git

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

Merge for resync
---

695931cf8e38da79a987ac65dc2408c7c20612c1