[commit: ghc] wip/hasfield: Merge remote-tracking branch 'origin/master' into wip/hasfield (b50eb34)

[git at git.haskell.org]

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

On branch  : wip/hasfield
Link       : http://ghc.haskell.org/trac/ghc/changeset/b50eb34cc3a941ded2b8c1e1b036b5767a620f55/ghc

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

commit b50eb34cc3a941ded2b8c1e1b036b5767a620f55
Merge: d3809a5 f141f41
Author: Adam Gundry <adam at well-typed.com>
Date:   Wed Dec 23 13:22:21 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/hasfield



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


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 b50eb34cc3a941ded2b8c1e1b036b5767a620f55