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

[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/6ebd54855c21d986690691ca4ecd682dbe03fac1/ghc

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

commit 6ebd54855c21d986690691ca4ecd682dbe03fac1
Merge: 25f45c4 6e618d7
Author: Adam Gundry <adam at well-typed.com>
Date:   Fri Jul 24 16:16:13 2015 +0100

    Merge remote-tracking branch 'origin/master' into wip/orf-reboot
    
    Conflicts:
    	compiler/deSugar/DsMeta.hs
    	compiler/rename/RnNames.hs
    	compiler/typecheck/TcPat.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 6ebd54855c21d986690691ca4ecd682dbe03fac1