[commit: haddock] wip/orf-reboot: Merge remote-tracking branch 'github/ghc-head' into wip/orf-reboot (4ad0043)

[git at git.haskell.org]

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

On branch  : wip/orf-reboot
Link       : http://git.haskell.org/haddock.git/commitdiff/4ad0043d43e97c0f59028e91a460d4d9abb90da5

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

commit 4ad0043d43e97c0f59028e91a460d4d9abb90da5
Merge: f1befea c7a8a8b
Author: Adam Gundry <adam at well-typed.com>
Date:   Fri Oct 16 13:17:24 2015 +0100

    Merge remote-tracking branch 'github/ghc-head' into wip/orf-reboot



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

4ad0043d43e97c0f59028e91a460d4d9abb90da5
 haddock-api/src/Haddock.hs                       | 15 ++++++---------
 haddock-api/src/Haddock/Backends/Xhtml.hs        |  2 +-
 haddock-api/src/Haddock/Backends/Xhtml/Layout.hs |  2 +-
 haddock-api/src/Haddock/Backends/Xhtml/Types.hs  |  2 +-
 haddock-api/src/Haddock/Interface/Create.hs      | 10 +++++-----
 haddock-api/src/Haddock/InterfaceFile.hs         | 12 ++++++------
 haddock-api/src/Haddock/ModuleTree.hs            |  6 +++---
 haddock-api/src/Haddock/Types.hs                 |  2 +-
 8 files changed, 24 insertions(+), 27 deletions(-)