Sebastianw Wehling-Benatelli ad909804d1 Merge branch 'master'
Conflicts:
	pylot/core/analysis/magnitude.py
	pylot/core/pick/autopick.py
	pylot/core/util/dataprocessing.py
2016-09-29 14:01:15 +02:00
..
2016-09-29 14:01:15 +02:00
2014-03-19 12:24:41 +01:00
2016-09-28 14:38:16 +02:00