[commit: ghc] wip/T10832-generalised-injectivity: Merge remote-tracking branch 'origin/master' into wip/T10832-generalised-injectivity (272fc85)

[git at git.haskell.org]

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

On branch  : wip/T10832-generalised-injectivity
Link       : http://ghc.haskell.org/trac/ghc/changeset/272fc85d99a096010523e317e46201fd31523c79/ghc

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

commit 272fc85d99a096010523e317e46201fd31523c79
Merge: 6dac3e8 1af0d36
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Dec 24 15:03:32 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/T10832-generalised-injectivity



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


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 272fc85d99a096010523e317e46201fd31523c79