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

[git at git.haskell.org]

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

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

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

commit a87bb2b35a9af784de688fe50cc2daea3090f5de
Merge: 6b05f0c 474d4cc
Author: Alejandro Serrano <trupill at gmail.com>
Date:   Mon Jul 27 17:05:10 2015 +0200

    Merge remote-tracking branch 'origin/master' into wip/impredicativity
    
    Conflicts:
    	compiler/typecheck/Inst.hs
    	compiler/typecheck/TcBinds.hs
    	compiler/typecheck/TcExpr.hs
    	compiler/typecheck/TcRnTypes.hs
    	compiler/types/Unify.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 a87bb2b35a9af784de688fe50cc2daea3090f5de