[commit: ghc] wip/new-flatten-skolems-Aug14: Merge remote-tracking branch 'origin/master' into wip/new-flatten-skolems-Aug14 (dae919a)

[git at git.haskell.org]

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

On branch  : wip/new-flatten-skolems-Aug14
Link       : http://ghc.haskell.org/trac/ghc/changeset/dae919a0f6b90d295fef3ebe4f2695db2eb6790b/ghc

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

commit dae919a0f6b90d295fef3ebe4f2695db2eb6790b
Merge: 22b3649 d786781
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Oct 16 09:05:19 2014 +0100

    Merge remote-tracking branch 'origin/master' into wip/new-flatten-skolems-Aug14
    
    Conflicts:
    	compiler/typecheck/TcRnTypes.lhs
    	compiler/typecheck/TcSMonad.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 dae919a0f6b90d295fef3ebe4f2695db2eb6790b