numpy/numpy — pull request #4375 by teoliphant (2014-02-26 23:48:49+00:00)
Title: Fix scalar inherit

This fixes the infinite recursion causing a segfault in Issue #1397