Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 15 Feb 2013 11:43:43 +0000 (11:43 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 15 Feb 2013 11:43:43 +0000 (11:43 +0000)
commit536ee09fc4bcf2c8084bbbcb5c7a62025e31a7a6
tree3d55b90115a104af30275ad3591464206f88b120
parent1b81f15308331560a4ff1c08bef767c832ef9272
parentb2a9fbfe38e5c18f367d020c36c45a1b10038149
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc