[commit: ghc] wip/new-flatten-skolems-Aug14: Merge branch 'master' into wip/new-flatten-skolems-Aug14 (a74611b)

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

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

commit a74611b92882320ee2ed1f8d8e9e7b3c7ec02cd9
Merge: 88a007c 2e4f364
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Sep 26 14:57:23 2014 +0100

    Merge branch 'master' into wip/new-flatten-skolems-Aug14
    
    Conflicts:
    	compiler/typecheck/Inst.lhs
    	compiler/typecheck/TcMType.lhs
    	compiler/typecheck/TcRnTypes.lhs
    	compiler/typecheck/TcSimplify.lhs
    	compiler/typecheck/TcUnify.lhs
    	testsuite/tests/indexed-types/should_compile/T3017.stderr
    	testsuite/tests/indexed-types/should_fail/T7729.stderr
    	testsuite/tests/indexed-types/should_fail/T8227.stderr
    	testsuite/tests/indexed-types/should_fail/T8518.stderr



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


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 a74611b92882320ee2ed1f8d8e9e7b3c7ec02cd9