btel/SpikeSort — pull request #26 by btel (2012-04-12 14:24:59+00:00)
Title: Dev

merge master with dev - pre-release