Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 19 Dec 2012 15:15:47 +0000 (15:15 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 19 Dec 2012 15:15:47 +0000 (15:15 +0000)
commit8c1aab0d75ce7499408c5493cf4aacdb196fa915
tree817dc214b815a8160d8d3038d59d9f3e6c984a95
parent942939c050b0649430a2e41b026499efb46d5f17
parenta38b8327e969f8e0e6b07c36be5c47709871f158
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc