[commit: packages/Cabal] ghc-head: Merge pull request #1374 from Jookia/haddock-finished (fea6b08)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/Cabal

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=fea6b08967c6110b295cf8827369b053e780e5cc

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

commit fea6b08967c6110b295cf8827369b053e780e5cc
Merge: 17ec871 f91f899
Author: Thomas Tuegel <ttuegel at gmail.com>
Date:   Fri Jun 14 10:31:43 2013 -0700

    Merge pull request #1374 from Jookia/haddock-finished
    
    Added support for test and benchmark documentation with Haddock.



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

fea6b08967c6110b295cf8827369b053e780e5cc
 Cabal/Distribution/Simple/Haddock.hs |   73 ++++++++++++++++++++++++++--------
 Cabal/Distribution/Simple/Setup.hs   |   59 +++++++++++++++++++++++++++
 2 files changed, 116 insertions(+), 16 deletions(-)