[commit: ghc] wip/impredicativity: Merge remote-tracking branch 'origin/master' into wip/impredicativity (e90efd0)

[git at git.haskell.org]

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

On branch  : wip/impredicativity
Link       : http://ghc.haskell.org/trac/ghc/changeset/e90efd08825e03f790ec98794213220e1730aaf6/ghc

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

commit e90efd08825e03f790ec98794213220e1730aaf6
Merge: eeab23c 74a00bc
Author: Alejandro Serrano <trupill at gmail.com>
Date:   Thu Jul 16 15:25:28 2015 +0200

    Merge remote-tracking branch 'origin/master' into wip/impredicativity
    
    Conflicts:
    	compiler/deSugar/DsBinds.hs
    	compiler/typecheck/TcErrors.hs
    	compiler/typecheck/TcInteract.hs
    	compiler/typecheck/TcRules.hs
    	compiler/typecheck/TcSimplify.hs
    	compiler/typecheck/TcType.hs
    	compiler/typecheck/TcValidity.hs
    	compiler/types/FamInstEnv.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 e90efd08825e03f790ec98794213220e1730aaf6