QuLogic/obspy — pull request #1 by krischer (2014-06-10 09:29:31+00:00)
Title: Manually merging master

I broke your PR by a commit of mine that requires a manual merge. I did it for you :-) Sorry about that!