Merge branch 'master' of http://darcs.haskell.org//testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 18 Jun 2012 08:14:01 +0000 (09:14 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 18 Jun 2012 08:14:01 +0000 (09:14 +0100)
commitdebfd1d0a2966c7fb56c4851767e8110660ed65a
tree33114fcfd2543d148f5e7b91614e6e30e0a88cfb
parenta00184412b7473f0128503439ca88f2e1885d816
parentd200ba10ad25b84bee8bef34adc66023148148ba
Merge branch 'master' of darcs.haskell.org//testsuite

Conflicts:
tests/th/all.T
testsuite/tests/th/all.T