Merge branch 'ff/c99' into next

* ff/c99:
  Remove all void-pointer arithmetic.

diff --cc diff.c
Simple merge

diff --cc http-push.c
Simple merge

diff --cc pack-objects.c
Simple merge

diff --cc pkt-line.c
Simple merge

diff --cc tag.c
Simple merge