Merge branch 'ghc-7.4'
authorNorman Ramsey <nr@cs.tufts.edu>
Sat, 21 Apr 2012 17:08:57 +0000 (13:08 -0400)
committerNorman Ramsey <nr@cs.tufts.edu>
Sat, 21 Apr 2012 17:08:57 +0000 (13:08 -0400)
commit1b02b7f231a6486534d345cea3e9536c4820a9fd
tree103d087e685466a28089db9d3a728b82797d4ec2
parente578e938e1ff8dd1233bcf89a7c6e62ed4d892ac
parent4b2fa9c4b6af00ef6759ff62a2b3efa7d9a8e59c
Merge branch 'ghc-7.4'

Conflicts:
hoopl.cabal