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

[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/0c60c0e602da6c5a6515f87ffc10daad37ec9330/ghc

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

commit 0c60c0e602da6c5a6515f87ffc10daad37ec9330
Merge: e7ac58a d2a2d5e
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Nov 26 15:36:07 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
    
    Conflicts:
    	compiler/typecheck/TcClassDcl.hs
    	compiler/typecheck/TcTyClsDecls.hs
    	compiler/typecheck/TcTyDecls.hs
    	compiler/typecheck/TcTypeable.hs
    	compiler/typecheck/TcValidity.hs
    	testsuite/tests/typecheck/should_fail/T5300.stderr
    	testsuite/tests/typecheck/should_fail/T8030.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 0c60c0e602da6c5a6515f87ffc10daad37ec9330