numpy/numpy — pull request #5405 by Garrett-R (2014-12-31 07:35:39+00:00)
Title: DOC: Docstring of np.diagonal to reflect edits of PR #5358

I should have included these edits to the docstring of `np.diagonal` with PR #5358. My bad!