Merge branch 'maint'

* maint:
  maint: update copyright year for 2013 (in branch maint)

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --cc Makefile.am
Simple merge

diff --cc NEWS
Simple merge

diff --cc aclocal.in
Simple merge

diff --cc automake.in
Simple merge

diff --cc bootstrap.sh
Simple merge

diff --cc configure.ac
Simple merge

diff --cc doc/automake.texi
Simple merge

diff --cc lib/Automake/Variable.pm
Simple merge

diff --cc lib/am/texibuild.am
Simple merge

diff --cc lib/am/texinfos.am
Simple merge

diff --cc lib/depcomp
Simple merge

diff --cc lib/ylwrap
index d59f6aa6eb38870f21fe93076d46a54e8081f460,1c4d77612c57115342fc14a86ab853a7d026b05b..f88e2e68045d79a38e9023389361e4f56b4e77bc
--- 1/lib/ylwrap
--- 2/lib/ylwrap
+++ b/lib/ylwrap
@@@ -1,9 -1,9 +1,9 @@@
  #! /bin/sh
  # ylwrap - wrapper for lex/yacc invocations.
  
 -scriptversion=2012-12-21.17; # UTC
 +scriptversion=2012-12-28.20; # UTC
  
- # Copyright (C) 1996-2012 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2013 Free Software Foundation, Inc.
  #
  # Written by Tom Tromey <tromey@cygnus.com>.
  #

diff --cc m4/amversion.m4
Simple merge

diff --cc m4/depend.m4
Simple merge

diff --cc m4/init.m4
Simple merge

diff --cc m4/obsolete-err.m4
Simple merge

diff --cc old/TODO
Simple merge

diff --cc syntax-checks.mk
Simple merge

diff --cc t/aclocal-acdir.sh
Simple merge

diff --cc t/aclocal-amflags.sh
Simple merge

diff --cc t/aclocal-deleted-header-aclocal-amflags.sh
Simple merge

diff --cc t/aclocal-dirlist.sh
Simple merge

diff --cc t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
Simple merge

diff --cc t/aclocal-path-precedence.sh
Simple merge

diff --cc t/am-prog-mkdir-p-no-more.sh
Simple merge

diff --cc t/autodist-configure-no-subdir.sh
Simple merge

diff --cc t/ax/distcheck-hook-m4.am
Simple merge

diff --cc t/backcompat6.sh
Simple merge

diff --cc t/dist-missing-m4.sh
Simple merge

diff --cc t/gettext-macros.sh
Simple merge

diff --cc t/help.sh
Simple merge

diff --cc t/libtool-macros.sh
Simple merge

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

diff --cc t/pluseq5.sh
Simple merge

diff --cc t/remake-deleted-m4-file.sh
Simple merge

diff --cc t/remake-gnulib-add-acsubst.sh
Simple merge

diff --cc t/remake-gnulib-add-header.sh
Simple merge

diff --cc t/remake-gnulib-remove-header.sh
Simple merge

diff --cc t/remake-moved-m4-file.sh
Simple merge

diff --cc t/remake-renamed-m4-file.sh
Simple merge

diff --cc t/remake-renamed-m4-macro-and-file.sh
Simple merge

diff --cc t/remake-renamed-m4-macro.sh
Simple merge

diff --cc t/subobj11a.sh
Simple merge

diff --cc t/warnings-obsolete-default.sh
Simple merge

diff --cc t/warnopts.sh
Simple merge

diff --cc t/werror2.sh
Simple merge