Merge branch 'maint'

diff --cc ChangeLog
Simple merge

diff --cc NEWS
index 704302e8af3adfcc70a566fcacb79edb8f5bc660,a3ce191e76d19a0090401531d7bea614c9780f15..ebb52d63de1e2dd33b1734f4f7e679e27a37d008
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -10,11 -2,10 +10,14 @@@ New in 1.11a
  
  * Miscellaneous changes:
  
 -Bugs fixed in 1.11.0a:
 +  - The `dist' and `dist-all' targets now can run compressors in parallel.
 +
+   - The `lzma' compression scheme and associated automake option `dist-lzma'
+     is obsoleted by `xz' and `dist-xz' due to upstream changes.
+ 
 +Bugs fixed in 1.11a:
 +
 +  - Lots of minor bugfixes.
  
  * Bugs introduced by 1.11:
  

diff --cc doc/automake.texi
Simple merge

diff --cc tests/Makefile.am
index ec28566a4e9d782195a986789a6c058534c7f0bb,4b73a627eb67cb0e78db2d61c4a92324855ef460..de56d36977cbe4b30f865dbf1015419196efafc9
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -312,7 -306,9 +312,10 @@@ extra5.test 
  extra6.test \
  extra7.test \
  extra8.test \
 +extra9.test \
+ extra10.test \
+ extra11.test \
+ extra12.test \
  f90only.test \
  flavor.test \
  flibs.test \

diff --cc tests/Makefile.in
index d7e9cd593b0819158fece2b2b3d616ba2feb293e,709739e41d779d761ec4b5f6e6db0e81c872677d..9da84246f0ea8716938dba19b8e737478f30c6ef
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -554,7 -541,9 +554,10 @@@ extra5.test 
  extra6.test \
  extra7.test \
  extra8.test \
 +extra9.test \
+ extra10.test \
+ extra11.test \
+ extra12.test \
  f90only.test \
  flavor.test \
  flibs.test \