Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 4 Dec 2012 11:17:16 +0000 (11:17 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 4 Dec 2012 11:17:16 +0000 (11:17 +0000)
commit9467f73fc514dd49f86a42178cf610a475c4b8a0
treee5b8bf2092f961a0899f33f74cc247613d132f9b
parent156d30d76c87230d1bb5374ccec4aa73387fec9a
parent3a40456f9befa1f3c4a83480f76f44f2babfafb9
Merge branch 'master' of darcs.haskell.org/ghc
compiler/types/Type.lhs