[commit: packages/haskeline] master: Merge branch 'release-0.7.2.3' (80bfa5d)

[git at git.haskell.org]

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

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/80bfa5d3ced4c8c4de701daefeafb96a405f0eb8

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

commit 80bfa5d3ced4c8c4de701daefeafb96a405f0eb8
Merge: 3600181 8addaa2
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Sun Apr 24 12:22:44 2016 -0700

    Merge branch 'release-0.7.2.3'
    
    Conflicts:
    	haskeline.cabal



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

80bfa5d3ced4c8c4de701daefeafb96a405f0eb8
 Changelog | 5 +++++
 1 file changed, 5 insertions(+)