[commit: ghc] wip/tc-plugins: Merge branch 'wip/new-flatten-skolems-Aug14' into wip/tc-plugins (dabf464)

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

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

commit dabf464a9ee327b7a77f96b7196b924eeeb11449
Merge: 1dcdde1 2c516a3
Author: Iavor S. Diatchki <diatchki at galois.com>
Date:   Wed Oct 8 16:10:13 2014 -0700

    Merge branch 'wip/new-flatten-skolems-Aug14' into wip/tc-plugins
    
    Conflicts:
    	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 dabf464a9ee327b7a77f96b7196b924eeeb11449