Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 14 Dec 2012 17:39:34 +0000 (17:39 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 14 Dec 2012 17:39:34 +0000 (17:39 +0000)
commit96acba6fe828bd9bc26459bba947125ddd80da76
tree79aa7201dc76573234b39f66064f57f85a09694d
parentfaa8ff40162da23a57b58fc128b0d672a8107a46
parentc79f733460c17d66853c184ccd1782d0be21b4dc
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc

Conflicts:
compiler/typecheck/TcTyClsDecls.lhs
compiler/iface/MkIface.lhs
compiler/main/DynFlags.hs