Merge branch 'master' into fomosto
gf/fomosto: fixed a problem in timing parameter determination
Merge branch 'fomosto' of git://github.com/emolch/pyrocko into fomosto
raise exception if no active event marker is set