Merge branch 'master' of http://darcs.haskell.org//testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 2 Mar 2012 20:06:35 +0000 (20:06 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 2 Mar 2012 20:06:35 +0000 (20:06 +0000)
Conflicts:
mk/boilerplate.mk

1  2 
testsuite/mk/boilerplate.mk

Simple merge