Merge branch 'maint' into ef/ipv4-connect-error-report
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Aug 2011 17:49:40 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Aug 2011 17:49:40 +0000 (10:49 -0700)
commit9353e09afa21b24fa356f960300e1c0a1567aa72
tree19e5cc0dce8dc56734ccbd2aa97f01aba3df8dbc
parentb35acb53458d0f99ba2400b902980b35e5acc2d3
parente08afecd7fe04b519b72f136c4a24b151c748f49
Merge branch 'maint' into ef/ipv4-connect-error-report

* maint:
  connect: correctly number ipv6 network adapter
connect.c