[commit: haddock] ghc-7.4: Merge http://code.haskell.org/~thielema/haddock/ into ghc-7.4 (27672d7)

[David Waern]

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

On branch  : ghc-7.4

http://hackage.haskell.org/trac/ghc/changeset/27672d7a5bbc3dbd26de17472f10e41f71b9d110

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

commit 27672d7a5bbc3dbd26de17472f10e41f71b9d110
Merge: b011c1a... 3eb6d27...
Author: David Waern <david.waern at gmail.com>
Date:   Wed May 16 02:27:56 2012 +0200

    Merge http://code.haskell.org/~thielema/haddock/ into ghc-7.4

 src/Haddock/Backends/Xhtml.hs       |    4 +-
 src/Haddock/Backends/Xhtml/Names.hs |    6 ++--
 src/Haddock/Interface/Create.hs     |   45 +++++++++++++++++++++++++---------
 src/Haddock/Options.hs              |    4 +-
 src/Haddock/Types.hs                |   16 ++++++------
 5 files changed, 48 insertions(+), 27 deletions(-)