Merge branch 'rs/maint-retval-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 27 Dec 2008 22:21:24 +0000 (14:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 27 Dec 2008 22:21:24 +0000 (14:21 -0800)
* rs/maint-retval-fix:
  merge-file: handle freopen() failure
  daemon: cleanup: factor out xstrdup_tolower()
  daemon: cleanup: replace loop with if
  daemon: handle freopen() failure


Trivial merge