Merge branch '2.5.x'
authorMark Wooding <mdw@distorted.org.uk>
Wed, 6 May 2020 09:18:58 +0000 (10:18 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Wed, 6 May 2020 09:18:58 +0000 (10:18 +0100)
* 2.5.x:
  vars.am: Don't build the test programs for installation.


Trivial merge