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

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

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

commit a8d29395e3d5ec18acbe9cdbd6ef3704f1df13a8
Merge: a256af5 43751b2
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Oct 26 12:51:24 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
    
    Conflicts:
    	compiler/hsSyn/HsDecls.hs
    	compiler/hsSyn/HsTypes.hs
    	compiler/hsSyn/HsUtils.hs
    	compiler/parser/RdrHsSyn.hs
    	compiler/rename/RnEnv.hs
    	compiler/rename/RnNames.hs
    	compiler/rename/RnPat.hs
    	compiler/rename/RnSource.hs
    	compiler/rename/RnTypes.hs
    	compiler/typecheck/TcBinds.hs
    	compiler/typecheck/TcDeriv.hs
    	compiler/typecheck/TcErrors.hs
    	compiler/typecheck/TcHsType.hs
    	compiler/typecheck/TcRnMonad.hs
    	compiler/typecheck/TcRnTypes.hs
    	compiler/typecheck/TcSimplify.hs
    	compiler/typecheck/TcSplice.hs
    	compiler/typecheck/TcTyClsDecls.hs
    	compiler/typecheck/TcType.hs
    	testsuite/tests/typecheck/should_fail/T5300.stderr
    	testsuite/tests/typecheck/should_fail/T8030.stderr
    	testsuite/tests/typecheck/should_fail/T9201.stderr
    	testsuite/tests/typecheck/should_fail/tcfail072.stderr
    	testsuite/tests/typecheck/should_run/T7861.stderr



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


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 a8d29395e3d5ec18acbe9cdbd6ef3704f1df13a8