Merge branch 'master' of http://darcs.haskell.org//packages/base
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 31 Oct 2012 09:20:45 +0000 (09:20 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 31 Oct 2012 09:20:45 +0000 (09:20 +0000)
commit7fa0073029a7df58315cc7074a5c3402a28d431a
treed2d750fc4a4dfe9a5c035fcea5c9e70085e036ca
parentf5dee983a0bfecc3f80d226f553201474d4e6aca
parent0ec659d74cdc9953d07f3be1e8dec168d5676fdc
Merge branch 'master' of darcs.haskell.org//packages/base
libraries/base/Data/Data.hs
libraries/base/Text/ParserCombinators/ReadP.hs