Merge branch 'ghc-generics' of http://darcs.haskell.org/ghc into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Fri, 20 May 2011 17:17:13 +0000 (19:17 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Fri, 20 May 2011 17:17:13 +0000 (19:17 +0200)
commit6ad311b7965a7af86f3b931b134215dff76f5fbb
treeedbab97f47a8f8d5c38d89b1560b9cbe1c905fc9
parent2d4d636af091b8da27466b5cf90011395a9c2f66
parentd7fb8d371d3228774331a67db8da805b2d68f1c4
Merge branch 'ghc-generics' of darcs.haskell.org/ghc into ghc-generics