Merge branch 'maint' into branch-1.11

* maint:
  gitattributes: custom merge driver for ChangeLog not needed anymore
  gitattributes: use "union" merge driver for NEWS
  tests: fix a timestamp-related spurious failures
  dryrun: fix regression with '$(am__make_dryrun)'
  test defs: function 'is_newest' now works also with directories
  refactor: new variable telling whether make is running in "dry mode"
  tests: do not clobber the modified CC
  tests: put AM_PROG_CC_C_O before AC_OUTPUT to help losing compilers

diff --cc tests/defs.in
Simple merge

diff --cc tests/depcomp8b.test
index 5651479,715d951..1a185e7
--- 1/tests/depcomp8b.test
--- 2/tests/depcomp8b.test
+++ b/tests/depcomp8b.test
@@@ -26,7 -26,7 +26,8 @@@ set -
  
  cat >> configure.in << 'END'
  AC_PROG_CC
 +AM_PROG_AR
+ #x AM_PROG_CC_C_O
  AC_PROG_LIBTOOL
  AC_OUTPUT
  END

diff --cc tests/list-of-tests.mk
Simple merge