Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 4 Dec 2012 12:03:39 +0000 (12:03 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 4 Dec 2012 12:03:39 +0000 (12:03 +0000)
commit88eeabcc2a5c9ded13efaac4bde4ff352ac57968
treeb60797280edb81ff52464d7a84650ba7c950c782
parent9467f73fc514dd49f86a42178cf610a475c4b8a0
parente6ce335e8e3ba0718efd234910185e4257424562
Merge branch 'master' of darcs.haskell.org/ghc