[Numpy-svn] [numpy/numpy] d69cd8: Revert line from #4585 to get mask, data shapes to...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/numpy/numpy
  Commit: d69cd857d8caa3477faf05152f3be634b51175f8
      https://github.com/numpy/numpy/commit/d69cd857d8caa3477faf05152f3be634b51175f8
  Author: Marten van Kerkwijk <mhvk at astro.utoronto.ca>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    M numpy/ma/core.py
    M numpy/ma/tests/test_core.py

  Log Message:
  -----------
  Revert line from #4585 to get mask, data shapes to match in .flat


  Commit: 61c699e5e1bf8b4b85ffd72a99691138d5674b50
      https://github.com/numpy/numpy/commit/61c699e5e1bf8b4b85ffd72a99691138d5674b50
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    M numpy/ma/core.py
    M numpy/ma/tests/test_core.py

  Log Message:
  -----------
  Merge pull request #4615 from mhvk/ma/matrix-flat-redo-shape

Revert line from #4585 to get mask, data shapes to match in .flat


Compare: https://github.com/numpy/numpy/compare/fbf2072039f9...61c699e5e1bf