[commit: ghc] wip/spj-wildcard-refactor: Merge branch 'wip/spj-wildcard-refactor' of ssh://git.haskell.org/ghc into wip/spj-wildcard-refactor (2edeac6)

[git at git.haskell.org]

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/2edeac6ea191b8f45d2faafff7a8097f27ca0f6a/ghc

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

commit 2edeac6ea191b8f45d2faafff7a8097f27ca0f6a
Merge: ee68443 93a97a6
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Nov 11 08:45:32 2015 +0000

    Merge branch 'wip/spj-wildcard-refactor' of ssh://git.haskell.org/ghc into wip/spj-wildcard-refactor



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


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 2edeac6ea191b8f45d2faafff7a8097f27ca0f6a