[udunits] 02/04: Merge tag 'upstream/2.2.20' into debian/master

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository udunits.

commit 0bb5f0bafc8203d2d0bf9ac55dc0f5bd35f7f3ea
Merge: 5332f5d 8a07b70
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Oct 29 02:55:08 2015 +0000

    Merge tag 'upstream/2.2.20' into debian/master

 CHANGE_LOG                |  21 +-
 CMakeLists.txt            |  47 ++-
 config.h.cmake            |   4 +-
 configure                 |  20 +-
 configure.ac              |   2 +-
 lib/CMakeLists.txt        |  24 +-
 lib/parser.c              | 858 ++++++++++++++++++++++++++--------------------
 lib/scanner.c             |  86 +++--
 lib/scanner.l             |   2 +-
 lib/udunits2-accepted.xml |  17 +-
 lib/udunits2lib.pdf       | Bin 270660 -> 270660 bytes
 prog/udunits2prog.pdf     | Bin 71512 -> 71512 bytes
 stamp-vti                 |   8 +-
 udunits2.html             |  10 +-
 udunits2.info             |   4 +-
 udunits2.pdf              | Bin 117913 -> 117911 bytes
 version.texi              |   8 +-
 17 files changed, 664 insertions(+), 447 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/udunits.git