nipy/dipy — pull request #167 by matthew-brett (2013-04-05 07:23:06+00:00)
Title: Merge maint

Merge the maintenance branch into master, using -s ours, so we can merge any commits on maintenance into master later, without getting merge conflicts on the version changes.