[Numpy-svn] [numpy/numpy] 6acf29: Fix an error in fmax docstring

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/numpy/numpy
  Commit: 6acf2969b5b35551dc3363881f4067c18052777a
      https://github.com/numpy/numpy/commit/6acf2969b5b35551dc3363881f4067c18052777a
  Author: Lev Levitsky <lev.levitsky at phystech.edu>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M numpy/core/code_generators/ufunc_docstrings.py

  Log Message:
  -----------
  Fix an error in fmax docstring


  Commit: 4065adbcc4e9d320f41b78922a906f16c6add7cc
      https://github.com/numpy/numpy/commit/4065adbcc4e9d320f41b78922a906f16c6add7cc
  Author: Jaime <jaime.frio at gmail.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M numpy/core/code_generators/ufunc_docstrings.py

  Log Message:
  -----------
  Merge pull request #5576 from levitsky/master

MAINT: Fix an error in fmax docstring


Compare: https://github.com/numpy/numpy/compare/564a5a294de4...4065adbcc4e9