[commit: haddock] alexbiehl-patch-1, ghc-8.0, ghc-head, ghc-head1, headdock-library-1.4.5, ie_avails, master, pr-filter-maps, pr/cabal-desc, travis, v2.17, v2.18, wip/new-tree-one-param, wip/rae, wip/remove-frames, wip/remove-frames1, wip/revert-ttg-2017-11-20, wip/ttg-2017-10-13, wip/ttg-2017-10-31, wip/ttg-2017-11-06, wip/ttg2-2017-11-10, wip/ttg3-2017-11-12, wip/ttg4-constraints-2017-11-13: Merge pull request #522 from Helkafen/master (e40990d)

[git at git.haskell.org]

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

On branches: alexbiehl-patch-1,ghc-8.0,ghc-head,ghc-head1,headdock-library-1.4.5,ie_avails,master,pr-filter-maps,pr/cabal-desc,travis,v2.17,v2.18,wip/new-tree-one-param,wip/rae,wip/remove-frames,wip/remove-frames1,wip/revert-ttg-2017-11-20,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13
Link       : http://git.haskell.org/haddock.git/commitdiff/e40990d4dbb80db2b7bf5a939866f9eaf4d5b309

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

commit e40990d4dbb80db2b7bf5a939866f9eaf4d5b309
Merge: 2c7c735 37692f6
Author: Sebastian Méric de Bellefon <arnaudpourseb at gmail.com>
Date:   Wed Jun 15 12:17:29 2016 -0400

    Merge pull request #522 from Helkafen/master
    
    publish haddock-test library



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

e40990d4dbb80db2b7bf5a939866f9eaf4d5b309
 Setup.lhs => haddock-test/Setup.lhs | 0
 haddock-test/haddock-test.cabal     | 2 +-
 haddock.cabal                       | 8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)