[commit: ghc] wip/rae-new-coercible: Merge remote-tracking branch 'origin/master' into wip/rae-new-coercible (f0bb9e9)

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

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

commit f0bb9e98c1316869a14feed97bcb3f48256c335a
Merge: d02925a a225c70
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Wed Dec 10 15:17:02 2014 -0500

    Merge remote-tracking branch 'origin/master' into wip/rae-new-coercible
    
    Conflicts:
    	compiler/typecheck/TcCanonical.hs
    	compiler/typecheck/TcFlatten.hs
    	compiler/typecheck/TcInteract.hs
    	compiler/typecheck/TcSMonad.hs
    	testsuite/tests/typecheck/should_compile/all.T



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


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 f0bb9e98c1316869a14feed97bcb3f48256c335a