Merge branch 'master' into devel

This commit is contained in:
John Evans 2013-05-27 10:38:24 -04:00
commit 8fdbf7326d

View file

@ -0,0 +1 @@
numpydoc==0.4