1 Commits

Author	SHA1	Message	Date
Rowan Cockett	e622dfb5cc	Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev ... Conflicts: .coveragerc .gitignore .travis.yml docs/api_Utils.rst docs/conf.py docs/index.rst requirements.txt setup.py	2015-11-04 09:59:11 -08:00