OPM/opm-core — pull request #64 by bska (2012-10-11 22:49:32+00:00)
Title: Bring ERT branch up-to-date with recent changes in master

This change merges all recent commits to master into ERT branch. Build-tested (in absence of ERT libraries) only.