[Numpy-svn] [numpy/numpy] aabd81: MAINT: Update the git .mailmap file.

[GitHub]

  Branch: refs/heads/maintenance/1.11.x
  Home:   https://github.com/numpy/numpy
  Commit: aabd81f07a56da6b89b5848c173862437618da12
      https://github.com/numpy/numpy/commit/aabd81f07a56da6b89b5848c173862437618da12
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    M .mailmap

  Log Message:
  -----------
  MAINT: Update the git .mailmap file.

[ci skip]


  Commit: ac15fb2d2b5fbe3dbea0dc08b9e3c701526fb6d0
      https://github.com/numpy/numpy/commit/ac15fb2d2b5fbe3dbea0dc08b9e3c701526fb6d0
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    M .mailmap

  Log Message:
  -----------
  Merge pull request #7086 from charris/update-mailmap

MAINT: Update the git .mailmap file.


Compare: https://github.com/numpy/numpy/compare/6521bcd2f52d...ac15fb2d2b5f