Merge branch 'master' of http://darcs.haskell.org/packages/base into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Wed, 4 May 2011 19:09:29 +0000 (21:09 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Wed, 4 May 2011 19:09:29 +0000 (21:09 +0200)
commit76dbb230df689648fb4c5de754441b86b9f9aefc
treedd968e88362ac48333cb2e79b29ab3a9f149d4de
parent9d3a29e4b8feff1387fc26d3d6431356e1c74d51
parentdc3ea0d9917409c2f1cc90a4a8d629b3ee4d4ba5
Merge branch 'master' of darcs.haskell.org/packages/base into ghc-generics