Merge branch 'jc/upload-corrupt' into next
commit78831b40d6ce24cdbcbfded049cb251097c58c13
authorJunio C Hamano <junkio@cox.net>
Wed, 21 Jun 2006 23:38:11 +0000 (21 16:38 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 21 Jun 2006 23:38:11 +0000 (21 16:38 -0700)
treeebd1aea0eadfc8e2fd695f27b63e27cb147ede28
parent811476d22480dd444b8eca9834829efce9648637
parentba0012c36705dcf847865759af69bba783afb69d
Merge branch 'jc/upload-corrupt' into next

* jc/upload-corrupt:
  daemon: send stderr to /dev/null instead of closing.
daemon.c