Tue Nov 28 11:43:40 UTC 2017

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

On branches: alexbiehl-patch-1,ghc-head,ghc-head1,haddock-quick,headdock-library-1.4.5,ie_avails,master,pr-filter-maps,pr/cabal-desc,travis,v2.18,wip-located-module-as,wip/D2418,wip/T12105,wip/T12105-2,wip/T12942,wip/T13163,wip/T14529,wip/T3384,wip/embelleshed-rdr,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,wip/ttg6-unrevert-2017-11-22
Link       : http://git.haskell.org/haddock.git/commitdiff/8269b349dd04f7561f9fe6c9e4ba514d3a7d21ab

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

commit 8269b349dd04f7561f9fe6c9e4ba514d3a7d21ab
Merge: c2e8915 17388b0
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Jan 18 09:50:06 2016 +0100

    Merge remote-tracking branch 'gridaphobe/ghc-head' into ghc-head


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

8269b349dd04f7561f9fe6c9e4ba514d3a7d21ab
 haddock-api/src/Haddock/Convert.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)