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)
1  2 
Data/Data.hs
Text/ParserCombinators/ReadP.hs

diff --cc Data/Data.hs
Simple merge
Simple merge