modified:   goodnew/core/mseed.py
Merge branch 'master' of https://github.com/damiencross/Seismo

Conflicts:
	goodnew/core/mseed.py

	modified:   goodnew/core/__init__.pyc
	modified:   goodnew/core/mseed.py
	modified:   goodnew/core/mseed.pyc
	modified:   goodnew/test_01.py