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

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

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

commit d709d7317d39fc42c51dd9761fc0866dfcd25aa6
Merge: a5fb4ba 3567207
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Oct 2 16:40:13 2014 +0100

    Merge remote-tracking branch 'origin/master' into wip/new-flatten-skolems-Aug14
    
    Conflicts:
    	compiler/typecheck/TcInteract.lhs



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


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 d709d7317d39fc42c51dd9761fc0866dfcd25aa6