Merge branch 'jk/update-git' into pu

* branch jk/update-git:
  WIP - currently pointing at a random point on Git's maint branch
Merge branch 'jk/compat-timegm' into pu

* branch jk/compat-timegm:
  compat/timegm: new compat function for systems lacking timegm()
  Makefile: re-include cgit.conf in cgit.mk
Merge branch 'jk/use-git-test-framework' into pu

* branch jk/use-git-test-framework:
  tests: use Git's test framework