Tue Nov 28 11:40:31 UTC 2017

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

On branches: 2.17.3.1-spanfix,alexbiehl-patch-1,ghc-8.0,ghc-8.0-facebook,ghc-head,ghc-head1,haddock-quick,headdock-library-1.4.5,ie_avails,issue-303,issue-475,master,pr-filter-maps,pr/cabal-desc,travis,v2.17,v2.17.3,v2.18,wip-located-module-as,wip/D2418,wip/T11028,wip/T11028-2,wip/T11028-3,wip/T11080-open-data-kinds,wip/T11258,wip/T11430,wip/T12105,wip/T12105-2,wip/T12942,wip/T13163,wip/T14529,wip/T3384,wip/embelleshed-rdr,wip/new-tree-one-param,wip/rae,wip/rae-nokinds,wip/remove-frames,wip/remove-frames1,wip/revert-ttg-2017-11-20,wip/spj-wildcard-refactor,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/c091ca829c253dc7f12f3a816a083c39979130f1

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

commit c091ca829c253dc7f12f3a816a083c39979130f1
Merge: c122a76 e763c00
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 20 23:12:49 2015 +0000

    Merge remote-tracking branch 'origin/ghc-head' into wip/spj-wildcard-refactor


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

c091ca829c253dc7f12f3a816a083c39979130f1
 haddock-api/src/Haddock/Interface/Create.hs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)