Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 16 Nov 2012 12:52:12 +0000 (12:52 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 16 Nov 2012 12:52:12 +0000 (12:52 +0000)
commit4ee5e3b2469c2919b33854ad5cdbbce895733db5
tree3661fc8da5d9001fe80dd5d734a2ee84a918d01a
parent1437590cc560f7e91e7887b4ce195226b26bb13f
parent6d784c43592290ec16db8b7f0f2a012dff3ed497
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc