[commit: packages/terminfo] master: Merge Git history with upstream again (e4bab81)

[git at git.haskell.org]

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

On branch  : master
Link       : http://git.haskell.org/packages/terminfo.git/commitdiff/e4bab81c683ce271a177c9d6b386c6ada3985997

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

commit e4bab81c683ce271a177c9d6b386c6ada3985997
Merge: 052e13e 315b1ee
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Apr 18 10:22:11 2017 +0200

    Merge Git history with upstream again



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

e4bab81c683ce271a177c9d6b386c6ada3985997