[commit: ghc] wip/spj-wildcard-refactor: Merge with HEAD (7ca373d)

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

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

commit 7ca373d496e5de0da1ea93fffc8a90fc86c53310
Merge: 93c12b3 6bef55c
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Sat Oct 31 19:18:20 2015 +0000

    Merge with HEAD



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


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 7ca373d496e5de0da1ea93fffc8a90fc86c53310