Merge branch 'master' of http://darcs.haskell.org//testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Sat, 17 Mar 2012 00:59:37 +0000 (00:59 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Sat, 17 Mar 2012 00:59:37 +0000 (00:59 +0000)
commit197917ed85980e349b159d1d16f2f2e0eac276ac
treea8cbce21893110eca71b77c7e42536c8119c593c
parentd773cf69dcf840cb163ca4207e16fe2b300bcc6d
parent9f598bbc229cd94297f46b8ffac36aeee4451e7e
Merge branch 'master' of darcs.haskell.org//testsuite

Conflicts:
tests/polykinds/all.T
tests/simplCore/should_run/T5915.stdout