[commit: ghc] wip/tc-plugins-amg: Merge remote-tracking branch 'origin/master' into wip/tc-plugins-amg (7b24feb)

[git at git.haskell.org]

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

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

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

commit 7b24febb2afc92289846a1ff7593d9a4ae2b61d1
Merge: c0f657f b9096df
Author: Adam Gundry <adam at well-typed.com>
Date:   Tue Nov 18 10:17:22 2014 +0000

    Merge remote-tracking branch 'origin/master' into wip/tc-plugins-amg



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


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