Merge branch 'fix-parallel-make-test' into pu

* branch fix-parallel-make-test:
  Makefile: fix parallel "make test"

In wip upstream.
Merge branch 'span-around-decorations' into pu

* branch span-around-decorations:
  ui-log: add <span/> around commit decorations

In wip upstream.
Merge branch 'html-die-on-write-failed' into pu

* branch html-die-on-write-failed:
  shared.c: use die_errno() where appropriate
  html.c: die when write fails

In wip upstream.
Merge branch 'jk/compat-timegm' into pu

* branch jk/compat-timegm:
  compat/timegm: new compat function for systems lacking timegm()

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 'jk/use-git-test-framework' into pu

* branch jk/use-git-test-framework:
  tests: add Valgrind support

Valgrind patch currently in its own branch upstream.
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

In its own branch upstream.
Merge branch 'fix-ls-cache-output-cache' into pu

* branch fix-ls-cache-output-cache:
  cache.c: cache ls_cache output properly
  tests: introduce strip_header() helper function

Submitted upstream.
Merge branch 'update-git' into pu

* branch update-git:
  git: update to 1.8.3-rc3

WIP waiting on the final Git v1.8.3 release.
Merge branch 'test-improvements' into pu

* branch test-improvements:
  WIP
  t0107: extract HTTP body more robustly

WIP improvements to make the test suite more robust.

Conflicts:
	tests/setup.sh
Merge branch 'scan-exclude' into pu

* branch scan-exclude:
  Add scan-exclude option to filter out repositories

An experiment to handle a certain use case.  Probably not desirable.