Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 5 Dec 2012 11:18:26 +0000 (11:18 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 5 Dec 2012 11:18:26 +0000 (11:18 +0000)
1  2 
compiler/typecheck/TcType.lhs

Simple merge