[commit: haddock] ghc-7.4: Merge branch 'ghc-7.4' of http://darcs.haskell.org/haddock into ghc-7.4 (23009e2)

[David Waern]

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

On branch  : ghc-7.4

http://hackage.haskell.org/trac/ghc/changeset/23009e2f7655103bbc816eceff0395e1aaeb2324

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

commit 23009e2f7655103bbc816eceff0395e1aaeb2324
Merge: 4b82bad... e4eceae...
Author: David Waern <david.waern at gmail.com>
Date:   Tue May 15 01:46:35 2012 +0200

    Merge branch 'ghc-7.4' of http://darcs.haskell.org/haddock into ghc-7.4

 src/Haddock/Interface/Create.hs     |    3 ++-
 src/Haddock/Interface/LexParseRn.hs |    8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)