miketrumpis/nitime — pull request #1 by arokem (2013-10-13 01:39:25+00:00)
Title: Mtrumpis mt fixups

This solves the merge conflicts with upstream/master and also solves an issue that came up when testing this without the cython extension compiled.