[commit: ghc] wip/new-flatten-skolems-Aug14: Merge commit with origin/master (c4eb017)

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

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

commit c4eb0176b606d2712ccce200fc12168013a144fc
Merge: e7988ed e319d6d
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Oct 21 15:11:29 2014 +0100

    Merge commit with origin/master



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


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 c4eb0176b606d2712ccce200fc12168013a144fc