Merge remote-tracking branch 'origin/master' into wip/new-flatten-skolems-Aug14
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 2 Oct 2014 15:40:13 +0000 (16:40 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 2 Oct 2014 15:40:13 +0000 (16:40 +0100)
Conflicts:
compiler/typecheck/TcInteract.lhs

1  2 
compiler/ghci/Debugger.hs
compiler/main/ErrUtils.lhs
compiler/nativeGen/AsmCodeGen.lhs
compiler/simplCore/Simplify.lhs
compiler/typecheck/TcInteract.lhs
compiler/typecheck/TcRnDriver.lhs
testsuite/tests/th/all.T

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge