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

[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/79a88406267b5e30f0f2ebefb16c96d2f2914667/ghc

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

commit 79a88406267b5e30f0f2ebefb16c96d2f2914667
Merge: 456a7f6 268aa9a
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Oct 30 16:16:31 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
    
    Conflicts:
    	compiler/hsSyn/HsBinds.hs
    	compiler/parser/Parser.y
    	compiler/rename/RnBinds.hs
    	compiler/rename/RnEnv.hs
    	compiler/typecheck/TcBinds.hs
    	compiler/typecheck/TcExpr.hs
    	compiler/typecheck/TcPatSyn.hs
    	compiler/typecheck/TcPatSyn.hs-boot
    	compiler/typecheck/TcUnify.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 79a88406267b5e30f0f2ebefb16c96d2f2914667