[iapws] 14/16: Merge tag 'upstream/1.2' 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 iapws.

commit d287f8ede521e7208a3cd02d78edac7b66959924
Merge: eb1cc21 b34da53
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Apr 20 11:46:33 2017 +0100

    Merge tag 'upstream/1.2' into debian/master

 PKG-INFO                   |  349 ++---
 README.rst                 |  343 +----
 iapws.egg-info/PKG-INFO    |  349 ++---
 iapws.egg-info/SOURCES.txt |    3 +
 iapws/__init__.py          |   12 +-
 iapws/_iapws.py            | 1460 +++++++++++++++++---
 iapws/_utils.py            |  216 +++
 iapws/ammonia.py           |  891 +++++++++++++
 iapws/humidAir.py          |  983 ++++++++++++++
 iapws/iapws08.py           |  634 +++++++--
 iapws/iapws95.py           | 2155 ++++++++++++++++++++----------
 iapws/iapws97.py           | 3163 +++++++++++++++++++++++++++++++++-----------
 setup.cfg                  |    1 -
 13 files changed, 7942 insertions(+), 2617 deletions(-)

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