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

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

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

commit f11d47d569cc724ffa6b2b594994972620311ece
Merge: 2edeac6 8868ff3
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 13 11:51:21 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
    
    Conflicts:
    	compiler/hsSyn/HsDecls.hs
    	compiler/parser/Parser.y
    	compiler/parser/RdrHsSyn.hs
    	compiler/rename/RnEnv.hs
    	compiler/rename/RnExpr.hs
    	compiler/rename/RnSource.hs
    	compiler/typecheck/TcBinds.hs
    	testsuite/tests/ghc-api/annotations/T10268.stdout
    	testsuite/tests/ghc-api/annotations/T10354.stdout
    	testsuite/tests/ghc-api/annotations/T10396.stdout
    	testsuite/tests/partial-sigs/should_compile/Defaulting2MROn.stderr
    	testsuite/tests/partial-sigs/should_compile/SomethingShowable.stderr
    	testsuite/tests/rename/should_fail/T2901.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 f11d47d569cc724ffa6b2b594994972620311ece