Merge branch 'maint'

* maint:
Remove unsupported C99 style struct initializers in git-archive.
Remove SIMPLE_PROGRAMS and make git-daemon a normal program.
Use ULONG_MAX rather than implicit cast of -1.

diff --cc Makefile
Simple merge

diff --cc builtin-apply.c
Simple merge