[commit: packages/haskeline] master: Merge branch 'master' into bump-lower-dep (8d0b3f7)

[git at git.haskell.org]

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

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/8d0b3f77efce22912806c9da104843ca189a49f3

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

commit 8d0b3f77efce22912806c9da104843ca189a49f3
Merge: e5ca1c5 5e53651
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Wed Dec 23 22:30:16 2015 -0800

    Merge branch 'master' into bump-lower-dep



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

8d0b3f77efce22912806c9da104843ca189a49f3
 .travis.yml                                | 4 ++++
 System/Console/Haskeline/Backend/Win32.hsc | 2 ++
 2 files changed, 6 insertions(+)