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

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

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

commit dbb36b5210c20f81351d941e9cc2641732c45e9a
Merge: 8fe2231 5f69c8e
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Oct 29 08:38:48 2014 +0000

    Merge remote-tracking branch 'origin/master' into wip/new-flatten-skolems-Aug14
    
    Conflicts:
    	compiler/typecheck/Inst.lhs
    	testsuite/tests/simplCore/should_compile/T3772.stdout



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


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 dbb36b5210c20f81351d941e9cc2641732c45e9a