nipy/dipy — pull request #168 by matthew-brett (2013-04-05 07:30:16+00:00)
Title: DOC: more updates to release notes

Add merge -s ours instructions for maintenance branch.

Add reminder to do pyx file doctests.