Merge branch 'maint'

* maint:
  Change C99 comments to old-style C comments

diff --cc builtin/for-each-ref.c
Simple merge

diff --cc remote.c
Simple merge