Merge branch 'rs/daemon-fixes' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Oct 2014 17:35:09 +0000 (10:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Oct 2014 17:35:09 +0000 (10:35 -0700)
* rs/daemon-fixes:
daemon: remove write-only variable maxfd
daemon: fix error message after bind()
daemon: handle gethostbyname() error

1  2 
daemon.c
diff --cc daemon.c
Simple merge