gentnerlab/pyoperant — pull request #71 by neuromusic (2014-10-02 17:50:11+00:00)
Title: pull dev into master

consolidating master as the main branch