Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Aug 2011 21:45:02 +0000 (14:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Aug 2011 21:45:02 +0000 (14:45 -0700)
commit259bcfb6b987021be592ed640253215bcbbf6d7d
treeee8474ba2caade3d32d3f096aaa007d9dd7f9c83
parent4e2e6ce45047fe2713546127f3d1ded576e1bf7e
parent3503b8d0da61d920ebd9294fd6a9a0f758328fd3
Merge branch 'maint'

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