[commit: ghc] wip/tc-plugins: Merge remote-tracking branch 'origin/wip/new-flatten-skolems-Aug14' into wip/tc-plugins (1313ef8)

[git at git.haskell.org]

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

On branch  : wip/tc-plugins
Link       : http://ghc.haskell.org/trac/ghc/changeset/1313ef893d8813ba9a814258365aaa28faa43e64/ghc

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

commit 1313ef893d8813ba9a814258365aaa28faa43e64
Merge: c55777e c4eb017
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date:   Sun Oct 26 21:13:46 2014 -0700

    Merge remote-tracking branch 'origin/wip/new-flatten-skolems-Aug14' into wip/tc-plugins
    
    Conflicts:
    	compiler/typecheck/TcInteract.lhs
    	testsuite/tests/typecheck/should_fail/ContextStack2.stderr
    	testsuite/tests/typecheck/should_fail/FrozenErrorTests.stderr
    	testsuite/tests/typecheck/should_run/T5751.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 1313ef893d8813ba9a814258365aaa28faa43e64