Code

Merge branch 'il/maint-colon-address'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Jan 2010 22:56:42 +0000 (14:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Jan 2010 22:56:42 +0000 (14:56 -0800)
* il/maint-colon-address:
  Allow use of []-wrapped addresses in git://
  Support addresses with ':' in git-daemon

1  2 
connect.c
daemon.c

diff --cc connect.c
Simple merge
diff --cc daemon.c
Simple merge