[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (1884f81)

Simon Peyton Jones <[email protected]> Wed, 02 Jan 2013 00:32:04 -0800

Newsgroups	gmane.comp.lang.haskell.cvs.ghc
Message-ID	<[email protected]>

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/1884f817f1156714ddbb8915d4061f417407bc7d

>---------------------------------------------------------------

commit 1884f817f1156714ddbb8915d4061f417407bc7d
Merge: e89f3ba... db9c062...
Author: Simon Peyton Jones <[email protected]>
Date:   Wed Jan 2 08:26:53 2013 +0000

    Merge branch 'master' of http://darcs.haskell.org/ghc

 compiler/main/DynFlags.hs         |    2 +-
 compiler/typecheck/TcInteract.lhs |   38 ++++++++++++++++++++++++++++++++++--
 2 files changed, 36 insertions(+), 4 deletions(-)