Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Sat, 9 Feb 2013 00:08:39 +0000 (00:08 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Sat, 9 Feb 2013 00:08:39 +0000 (00:08 +0000)
commitfb02fa090a5370d214e5303da88005cc6f55427a
treecd337a99509e654b8aca41643726c69bc686030a
parentbcbfdd0331b0aef102920f7f183aa07b0b74de31
parentf52b4ad90f940bdb1e8719fbbc395450d2131a8a
Merge branch 'master' of darcs.haskell.org/ghc

Conflicts:
compiler/typecheck/TcInstDcls.lhs
compiler/typecheck/TcInstDcls.lhs
compiler/typecheck/TcTyClsDecls.lhs
compiler/types/FamInstEnv.lhs