Merge branch 'master' of http://darcs.haskell.org/packages/base into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Tue, 17 May 2011 06:51:23 +0000 (08:51 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Tue, 17 May 2011 06:51:23 +0000 (08:51 +0200)
commit6c3798426906a7801a3edae9e2e31cb147d7f73e
tree26f6c2d30983626e864c444c9c8d7518fdf115e2
parentdecc2725e1a5308cb53b5c29cf5917906da77b19
parent509f28cc93b980d30aca37008cbe66c677a0d6f6
Merge branch 'master' of darcs.haskell.org/packages/base into ghc-generics