[commit: ghc] wip/spj-wildcard-refactor: Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor (e6be9fd)

[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/e6be9fda05697784a11195bd0e0472a8487e7466/ghc

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

commit e6be9fda05697784a11195bd0e0472a8487e7466
Merge: 5e0727e 5d6cfbc
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Nov 23 13:42:29 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
    
    Conflicts:
    	compiler/deSugar/DsMeta.hs
    	compiler/hsSyn/Convert.hs
    	compiler/hsSyn/HsTypes.hs
    	compiler/parser/Parser.y
    	compiler/parser/RdrHsSyn.hs
    	compiler/rename/RnExpr.hs
    	compiler/rename/RnTypes.hs
    	compiler/typecheck/TcRnDriver.hs
    	compiler/typecheck/TcTyClsDecls.hs
    	testsuite/tests/ghc-api/landmines/landmines.stdout
    	testsuite/tests/partial-sigs/should_compile/T10403.stderr
    	testsuite/tests/partial-sigs/should_fail/Trac10045.stderr
    	testsuite/tests/polykinds/T9222.stderr
    	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 e6be9fda05697784a11195bd0e0472a8487e7466