Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 2 Jan 2013 08:26:53 +0000 (08:26 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 2 Jan 2013 08:26:53 +0000 (08:26 +0000)
commit1884f817f1156714ddbb8915d4061f417407bc7d
tree2e9d0cfc9ea9571bafba27a934cfa0ea5d7881cc
parente89f3bac94f513841f46346528183920783ce1f9
parentdb9c062a4a7c39563a3a9a83718cc0ce6d4babae
Merge branch 'master' of darcs.haskell.org/ghc