[commit: ghc] wip/tc-plugins: Merge branch 'wip/tc-plugins' into merge-plugins (bc0ccfa)

[git at git.haskell.org]

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

On branch  : wip/tc-plugins
Link       : http://ghc.haskell.org/trac/ghc/changeset/bc0ccfaf5b926a6fc735abd04416920d09996349/ghc

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

commit bc0ccfaf5b926a6fc735abd04416920d09996349
Merge: 31729d0 723e672
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date:   Sun Nov 9 15:56:08 2014 -0800

    Merge branch 'wip/tc-plugins' into merge-plugins
    
    The temporary branch `merge-plugins` squashed all changes on ths branch
    in a single commit.  It also removed some accidental changes.
    This "merge" simply declares that all the content of `wip/tc-plugins`
    is already present (i.e. I am using merge startegy `ours`).



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

bc0ccfaf5b926a6fc735abd04416920d09996349