Commit 38d0ab56 authored by Andrew Quinn's avatar Andrew Quinn
Browse files

Merge branch 'master' into 'irasa' 

# Conflicts:
#   sails/_docstring_utils.py
#   sails/stft.py
#   sails/tests/test_stft.py
parents b61e51f3 741dfa26

There are no changes