Merge branch 'jk/commit-dates-parsing-fix' into maint

* jk/commit-dates-parsing-fix:
  t4212: loosen far-in-future test for AIX
  date: recognize bogus FreeBSD gmtime output

diff --cc Makefile
Simple merge

diff --cc config.mak.uname
Simple merge

diff --cc git-compat-util.h
Simple merge

diff --cc t/t4212-log-corrupt.sh
Simple merge