Merge branch 'release' of https://github.com/coolprop/coolprop into release
Authored by: Ian Bell 2015-03-01
Parents: [173bc5][421a6e]
Child: [bd14f0]