Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 8 Jan 2013 08:33:25 +0000 (08:33 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 8 Jan 2013 08:33:25 +0000 (08:33 +0000)
commit0488163a64279d4b8fc4a6edaac47e0d117f4340
tree59421598969a7155b86dfd772474e6e923f2847f
parent441a87a10e0a97c7af8beb19dfb02eb375c0e01f
parent744035fdd4b882c17ef7c6e4439b9e7099e7ec3d
Merge branch 'master' of darcs.haskell.org/testsuite

Conflicts:
tests/simplCore/should_compile/T7360.stderr
testsuite/tests/driver/T4437.hs
testsuite/tests/simplCore/should_compile/T7360.stderr