Merge branch 'maint'

Conflicts: tests/distcom7.test

diff --cc ChangeLog
Simple merge

diff --cc tests/distcom7.test
index 34f876e694f26d7b61b69ea201170ca631d6c687,3ea509605a1ec76c0725020f212ec5c8580ea805..c14d94c3c2aead2ae96c5af112fc0897009c018a
--- 1/tests/distcom7.test
--- 2/tests/distcom7.test
+++ b/tests/distcom7.test
@@@ -39,4 -42,6 +42,6 @@@ EN
  
  $ACLOCAL
  AUTOMAKE_fails --add-missing subdir/Makefile
 -grep 'full run' stderr
 +grep 'without.*Makefile.*arguments' stderr
+ 
+ :