[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (2c12b91)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/2c12b912949883a8fc39b929173fb0409d5878e3

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

commit 2c12b912949883a8fc39b929173fb0409d5878e3
Merge: 858888e... ea53d9c...
Author: Ian Lynagh <ian at well-typed.com>
Date:   Fri Jan 18 18:17:32 2013 +0000

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

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