Merge "Restore compatibility with curl < 7.16.2"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 9 Dec 2013 17:49:24 +0000 (17:49 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 9 Dec 2013 17:49:24 +0000 (17:49 +0000)

Trivial merge