[commit: ghc] wip/nested-cpr: Merge remote-tracking branch 'origin/master' into HEAD (31da0b1)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nested-cpr
Link       : http://ghc.haskell.org/trac/ghc/changeset/31da0b116db24d5db5346320382021c3d03af4d3/ghc

>---------------------------------------------------------------

commit 31da0b116db24d5db5346320382021c3d03af4d3
Merge: 4f216b0 289ecda
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Dec 10 10:43:12 2013 +0000

    Merge remote-tracking branch 'origin/master' into HEAD



>---------------------------------------------------------------

31da0b116db24d5db5346320382021c3d03af4d3
 .mailmap                     |   60 ++++++++++++++++++++++++++++++++++++++++++
 compiler/stranal/DmdAnal.lhs |   13 +++++----
 2 files changed, 68 insertions(+), 5 deletions(-)