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

[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/a52d3a8b6b777108ade1bfcad69efc1a3ddcf47b/ghc

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

commit a52d3a8b6b777108ade1bfcad69efc1a3ddcf47b
Merge: 6ff694b 6da18b8
Author: Adam Gundry <adam at well-typed.com>
Date:   Fri Mar 20 15:04:15 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/orf-reboot
    
    Conflicts:
    	compiler/rename/RnSource.hs
    	compiler/typecheck/TcRnTypes.hs
    	compiler/types/TyCon.hs



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


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 a52d3a8b6b777108ade1bfcad69efc1a3ddcf47b