Merge branch 'ghc-generics'
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Thu, 26 May 2011 16:27:34 +0000 (18:27 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Thu, 26 May 2011 16:27:34 +0000 (18:27 +0200)
commitcb2d37da5792b13f5988049f67a24263b4de4ff2
tree12101ebe4f13c614bebfb1598937bed65e8af681
parent1091ebc9aaf430a0ed69f4ebd6190e31c3154e90
parent74e1e73af872e63fbbec2bc9442494c3657053c3
Merge branch 'ghc-generics'