[commit: haddock] wip/T9840: Merge remote-tracking branch 'origin/ghc-head' into wip/T9840 (31d1ed3)

[git at git.haskell.org]

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

On branch  : wip/T9840
Link       : http://git.haskell.org/haddock.git/commitdiff/31d1ed31e8708bcf5c141f200a2609692cbe2c59

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

commit 31d1ed31e8708bcf5c141f200a2609692cbe2c59
Merge: 714de29 5bbae8b
Author: Adam Gundry <adam at well-typed.com>
Date:   Mon May 4 13:53:39 2015 +0100

    Merge remote-tracking branch 'origin/ghc-head' into wip/T9840



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

31d1ed31e8708bcf5c141f200a2609692cbe2c59
 haddock-api/src/Haddock/Convert.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)