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

[David Waern]

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

On branch  : ghc-7.4

http://hackage.haskell.org/trac/ghc/changeset/3094d05c77c6efb8affb74886f0d8c3b2bfc1172

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

commit 3094d05c77c6efb8affb74886f0d8c3b2bfc1172
Merge: c3d370a... 162364b...
Author: Henning Thielemann <git at henning-thielemann.de>
Date:   Mon Apr 2 00:25:31 2012 +0200

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

 src/Main.hs |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)