[commit: ghc] wip/spj-wildcard-refactor: Merge remote-tracking branch (eb3adff)

[git at git.haskell.org]

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/eb3adffcd8ab9593f7e109d5f703a15ea7b97613/ghc

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

commit eb3adffcd8ab9593f7e109d5f703a15ea7b97613
Merge: fafafad f40fe62
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 20 23:50:27 2015 +0000

    Merge remote-tracking branch
    
      'origin/master' into wip/spj-wildcard-refactor
    
    Conflicts:
    	compiler/parser/Parser.y
    	compiler/rename/RnEnv.hs
    	compiler/rename/RnExpr.hs
    	compiler/typecheck/TcBinds.hs
    	compiler/typecheck/TcErrors.hs
    	compiler/typecheck/TcEvidence.hs
    	compiler/typecheck/TcExpr.hs
    	utils/haddock



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


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc eb3adffcd8ab9593f7e109d5f703a15ea7b97613