[commit: ghc] wip/rae-new-coercible: Merge commit 'b57ff27' into wip/rae-new-coercible (fb10b82)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/rae-new-coercible
Link       : http://ghc.haskell.org/trac/ghc/changeset/fb10b827e6cefd82f96c66b2cb697f016fe4a48c/ghc

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

commit fb10b827e6cefd82f96c66b2cb697f016fe4a48c
Merge: 85db007 b57ff27
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Sun Dec 7 14:46:47 2014 -0500

    Merge commit 'b57ff27' into wip/rae-new-coercible
    
    Conflicts:
    	compiler/typecheck/FamInst.hs
    	compiler/typecheck/FunDeps.hs
    	compiler/typecheck/TcCanonical.hs
    	compiler/typecheck/TcErrors.hs
    	compiler/typecheck/TcEvidence.hs
    	compiler/typecheck/TcFlatten.hs
    	compiler/typecheck/TcInteract.hs
    	compiler/typecheck/TcRnTypes.hs
    	compiler/typecheck/TcSMonad.hs
    	compiler/typecheck/TcType.hs



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


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 fb10b827e6cefd82f96c66b2cb697f016fe4a48c