Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 16 Jul 2012 15:18:33 +0000 (16:18 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 16 Jul 2012 15:18:33 +0000 (16:18 +0100)
1  2 
compiler/typecheck/TcTyClsDecls.lhs

Simple merge