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

Submitted to cgit@hjemli.net but not applied.

Need to see if there is an alternative to introducing a compat function.
Doing the back and forth in the local timezone is mostly good enough,
but doesn't handle DST correctly.
Merge branch 'log-follow-files' into pu

* branch log-follow-files:
  log: allow users to follow a file
  shared: make cgit_diff_tree_cb public

Submitted to cgit@hjemli.net.
Merge branch 'update-git' into pu

* branch update-git:
  git: update to 1.8.3-rc1
  t0001: validate Git -rcN version numbers correctly
  git: update to 1.8.2.2

First two patches submitted.  Last patch is a WIP waiting on the final
Git v1.8.3 release.
Merge branch 'fix-tests-with-dash' into pu

* branch fix-tests-with-dash:
  t0109: "function" is a bash-ism