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)
1  2 
compiler/types/Type.lhs

Simple merge