[iapws] 03/16: Merge tag 'upstream/1.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 910248f795e75b733e6d2b4576fc27dad098fa9c
Merge: 6fb691a 543a37a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Jun 2 11:16:52 2016 +0100

    Merge tag 'upstream/1.1.2' into debian/master

 PKG-INFO                    |   5 +-
 iapws.egg-info/PKG-INFO     |   5 +-
 iapws.egg-info/requires.txt |   2 +-
 iapws/__init__.py           | 931 +-------------------------------------------
 iapws/iapws95.py            |  23 +-
 iapws/iapws97.py            |  52 +--
 setup.py                    |  11 +-
 7 files changed, 59 insertions(+), 970 deletions(-)

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