[Numpy-discussion] Another merge at github

[Hoyt Koepke]

FYI for general readers, I found the following discussion on this
topic really helpful:

http://stackoverflow.com/questions/457927/git-workflow-and-rebase-vs-merge-questions

--Hoyt


++++++++++++++++++++++++++++++++++++++++++++++++
+ Hoyt Koepke
+ University of Washington Department of Statistics
+ http://www.stat.washington.edu/~hoytak/
+ hoytak at gmail.com
++++++++++++++++++++++++++++++++++++++++++