Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 24 Dec 2012 14:07:04 +0000 (14:07 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 24 Dec 2012 14:07:04 +0000 (14:07 +0000)
commit3a2ce0baf1c6e8321ecd9a250235cb74f54f4be4
tree24c72950bc82dd6b63a5d7ac47d90afe39c16475
parent53a3f0de4fbf57079b866333e1b02e34414250a0
parent49bfb6311971a15badb00becaeac407030dd0ad9
Merge branch 'master' of darcs.haskell.org/testsuite

Conflicts:
tests/typecheck/should_fail/all.T
testsuite/tests/typecheck/should_fail/all.T