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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/69b2113c1dbc5e583718e64e6ff2145daf721b31

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

commit 69b2113c1dbc5e583718e64e6ff2145daf721b31
Merge: b74748f... 4a3b8c3...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Mar 9 17:19:22 2012 +0000

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

 docs/users_guide/glasgow_exts.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)