Import v1.10
Import v1.10.1
Import v1.10.2
Import v1.11
Merge tag 'v1.10'

Import v1.10

Conflicts:
	Makefile.in
	aclocal.m4
	automake.in
	configure
	configure.ac
	doc/Makefile.in
	doc/automake.info
	doc/automake.info-1
	doc/automake.info-2
	doc/automake.texi
	doc/stamp-vti
	doc/version.texi
	lib/Automake/Makefile.in
	lib/Automake/tests/Makefile.in
	lib/Makefile.in
	lib/am/Makefile.in
	lib/am/install.am
	lib/am/ltlibrary.am
	lib/am/program.am
	lib/missing
	m4/Makefile.in
	m4/amversion.m4
	tests/Makefile.in
	tests/fort1.test
	tests/objc.test
automake: revert to vendor file
Merge tag 'v1.10.1'

Import v1.10.1

Conflicts:
	configure.ac
	doc/Makefile.in
	doc/automake.info-1
	doc/automake.info-2
	doc/stamp-vti
	doc/version.texi
	lib/Automake/Makefile.in
	lib/Automake/Options.pm
	lib/Makefile.in
	m4/amversion.m4
Merge tag 'v1.10.2'

Import v1.10.2

Conflicts:
	Makefile.am
	configure.ac
	doc/automake.info-1
	doc/automake.info-2
	doc/stamp-vti
	doc/version.texi
	lib/Automake/tests/Makefile.in
	m4/amversion.m4
	tests/Makefile.in
Merge tag 'v1.11'

v1.11 imported

Conflicts:
	automake.in
	configure.ac
	doc/Makefile.in
	doc/automake.info-1
	doc/automake.info-2
	doc/stamp-vti
	doc/version.texi
	lib/Automake/Makefile.in
	lib/Automake/tests/Makefile.in
	lib/Makefile.in
	lib/am/Makefile.in
	lib/am/data.am
	lib/am/install.am
	lib/am/java.am
	lib/am/libs.am
	lib/am/lisp.am
	lib/am/ltlib.am
	lib/am/ltlibrary.am
	lib/am/mans.am
	lib/am/program.am
	lib/am/progs.am
	lib/am/python.am
	lib/am/scripts.am
	lib/am/texinfos.am
	m4/Makefile.in
	m4/amversion.m4
	tests/Makefile.in
Import v1.12
Merge tag 'v1.12'

Conflicts:
	Makefile.am
	automake.in
	bootstrap
	configure.ac
	doc/Makefile.in
	doc/automake.info-1
	doc/automake.info-2
	lib/Automake/Makefile.in
	lib/Automake/Options.pm
	lib/Automake/tests/Makefile.in
	lib/Makefile.in
	lib/am/Makefile.am
	lib/am/Makefile.in
	lib/am/lang-compile.am
	lib/am/ltlibrary.am
	lib/missing
	m4/Makefile.in
	m4/amversion.m4
	tests/Makefile.in
Import v1.13
Merge tag 'v1.13'

Note bootstrap vendor -> bootstrap.sh and we have a copy of our original bootstrap.

Conflicts:
	Makefile.am
	automake.in
	bootstrap.sh
	configure.ac
	lib/missing
	m4/amversion.m4
Import v1.14
Merge tag 'v1.14'

Still work to do, Makefile.am has lost local commits.

Conflicts:
	bin/automake.in
	bootstrap.sh
	configure.ac
	lib/am/ltlibrary.am
	m4/amversion.m4
Put Starlink patch back

No idea why this was lost
Track vendor changes
Remove files removed by vendor