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

[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/1e9fba0a10b30d13c1d3b1649d456ab6fe77e55d/ghc

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

commit 1e9fba0a10b30d13c1d3b1649d456ab6fe77e55d
Merge: 39c7957 5aa57d0
Author: Adam Gundry <adam at well-typed.com>
Date:   Fri Mar 27 14:07:32 2015 +0000

    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 1e9fba0a10b30d13c1d3b1649d456ab6fe77e55d