Mon Nov 20 21:00:01 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/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
Link       : http://git.haskell.org/haddock.git/commitdiff/57a5dcfd3d2a7e01229a2c3a79b1f99cd95d5de1

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

commit 57a5dcfd3d2a7e01229a2c3a79b1f99cd95d5de1
Merge: 8269b34 af205d2
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Feb 7 23:34:52 2016 +0100

    Merge branch 'master' into ghc-head


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

57a5dcfd3d2a7e01229a2c3a79b1f99cd95d5de1
 haddock-api/src/Haddock/Convert.hs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)