[commit: ghc] wip/14691: Merge remote-tracking branch 'origin/master' into wip/14691 (73f91e6)

[git at git.haskell.org]

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

On branch  : wip/14691
Link       : http://ghc.haskell.org/trac/ghc/changeset/73f91e6f3871af9e6a57f9f294f1e8c0a0aecfde/ghc

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

commit 73f91e6f3871af9e6a57f9f294f1e8c0a0aecfde
Merge: c022a9f 40c753f
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Fri Jan 26 11:50:14 2018 -0500

    Merge remote-tracking branch 'origin/master' into wip/14691



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

73f91e6f3871af9e6a57f9f294f1e8c0a0aecfde
 libraries/terminfo                 | 2 +-
 testsuite/tests/perf/haddock/all.T | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)