Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 25 Oct 2011 15:30:01 +0000 (16:30 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 25 Oct 2011 15:30:01 +0000 (16:30 +0100)
commitc7dd812dbbedc6c9376a942e59d68dc98bf72ef4
treec81f470330ecaa829cdc62ff78260247b0bb73f4
parent29ac8506edc946373ae19d61f9ed105d3a834bca
parent93cd6985ff415817efa7a67741ecd0147dd6170f
Merge branch 'master' of darcs.haskell.org/testsuite

Conflicts:
tests/ghci/scripts/all.T
testsuite/tests/ghci/scripts/all.T