[commit: haddock] ghc-7.8: Merge remote-tracking branch 'v2.14' into ghc-7.8 (3e6da2f)

[git at git.haskell.org]

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

On branch  : ghc-7.8
Link       : http://git.haskell.org/haddock.git/commitdiff/3e6da2f7b2b734da7dfe688a9f0eb764dcf6e8f0

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

commit 3e6da2f7b2b734da7dfe688a9f0eb764dcf6e8f0
Merge: e0299ec 78d195c
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Mar 21 18:52:19 2014 +0100

    Merge remote-tracking branch 'v2.14' into ghc-7.8
    
    Signed-off-by: Herbert Valerio Riedel <hvr at gnu.org>



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

3e6da2f7b2b734da7dfe688a9f0eb764dcf6e8f0
 haddock.cabal |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)