Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 18 Jan 2013 14:31:59 +0000 (14:31 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 18 Jan 2013 14:31:59 +0000 (14:31 +0000)
commit04abb495bbc2b2ac99f5d2a6eb6193e21cd3fe0a
tree9a938178ac039c3ef923548af0655c732bffe42e
parente39539df04e918d84623e4ab94cd2b294f477483
parentf61fbf39379fa76818ad5b2d0c7952066fbe2cef
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc