Merge branch 'master' of http://darcs.haskell.org//testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 3 Oct 2012 07:49:18 +0000 (08:49 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 3 Oct 2012 07:49:18 +0000 (08:49 +0100)
commit37c33c55d94f27b9e9444701b7ad5670c533361f
tree7d546a05571c2158190660347da42679b01b83ec
parent7d7c728d2d8e63f0b86befe8ab270bc09efd19ca
parente19b6fd12bee4f49f1a59faa9b23c2f8c2a7e41e
Merge branch 'master' of darcs.haskell.org//testsuite

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