Merge branch 'ghc-generics' of http://darcs.haskell.org/packages/base into ghc-generics
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 25 May 2011 06:54:29 +0000 (07:54 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 25 May 2011 06:54:29 +0000 (07:54 +0100)
commit0d363cf82a46a55b7d0b407fb667f9ea9756a578
treeb1de8ffdcc8ebba98a88049b4d6a51a3b06a0749
parent7e0984fb4e3bf25e6050ab6fecc98211ad9f3ecd
parent479397bff23bc7516d6e8b9d553de96537405ec1
Merge branch 'ghc-generics' of darcs.haskell.org/packages/base into ghc-generics