[commit: ghc] wip/orf-reboot: Merge remote-tracking branch 'origin/master' into wip/orf-reboot (7b8621e)

[git at git.haskell.org]

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

On branch  : wip/orf-reboot
Link       : http://ghc.haskell.org/trac/ghc/changeset/7b8621ec14ac19b32cb85a10112c7c4debf6b557/ghc

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

commit 7b8621ec14ac19b32cb85a10112c7c4debf6b557
Merge: 2c99538 f2ffdc6
Author: Adam Gundry <adam at well-typed.com>
Date:   Sat Jun 20 13:28:37 2015 +0100

    Merge remote-tracking branch 'origin/master' into wip/orf-reboot



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


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