Merge branch 'master' of http://darcs.haskell.org/packages/base into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Fri, 20 May 2011 18:15:48 +0000 (20:15 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Fri, 20 May 2011 18:15:48 +0000 (20:15 +0200)
commit479397bff23bc7516d6e8b9d553de96537405ec1
treeb1de8ffdcc8ebba98a88049b4d6a51a3b06a0749
parent6c3798426906a7801a3edae9e2e31cb147d7f73e
parentacfd22e03a9d611734df20d673f2804da682e223
Merge branch 'master' of darcs.haskell.org/packages/base into ghc-generics