Merge branch 'tc/curl-vernum-output-broken-in-7.11' into maint
commitf5a191d3dcbd0deaae9eba2a141e0f086ea0eb20
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:13:07 +0000 (5 13:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:13:07 +0000 (5 13:13 -0800)
tree5902b026e0276dff5c56520cc7b54975d3bdde0a
parente591339ce7632f3c9000f0fde8ee4813f061a11e
parent3af67924e03ddb29a2b698266a9f27ef30cd663b
Merge branch 'tc/curl-vernum-output-broken-in-7.11' into maint

Certain older vintages of cURL give irregular output from
"curl-config --vernum", which confused our build system.

* tc/curl-vernum-output-broken-in-7.11:
  Makefile: handle broken curl version number in version check