[iapws] 02/06: Merge tag 'upstream_1.1.1'

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian_1.1.1-1
in repository iapws.

commit cf8fa27542d2ac8ce9516baf264ce1f8b779cd12
Merge: 9e85c02 5369c68
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri May 1 12:11:57 2015 +0100

    Merge tag 'upstream_1.1.1'

 PKG-INFO                |   2 +-
 iapws.egg-info/PKG-INFO |   2 +-
 iapws/__init__.py       |  28 +++++-----
 iapws/iapws08.py        |   2 +-
 iapws/iapws95.py        | 132 ++++++++++++++++++++++++++++++------------------
 iapws/iapws97.py        |   4 +-
 6 files changed, 101 insertions(+), 69 deletions(-)

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