[commit: packages/haskeline] master: Merge branch 'asr-master' (87a01d2)

[git at git.haskell.org]

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

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/87a01d222ef13f89a68204602e3fe9273eeed3ca

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

commit 87a01d222ef13f89a68204602e3fe9273eeed3ca
Merge: 9d032a3 bcc1b81
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Tue Jan 20 10:36:40 2015 -0800

    Merge branch 'asr-master'
    
    Conflicts:
    	haskeline.cabal



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

87a01d222ef13f89a68204602e3fe9273eeed3ca
 .gitignore      | 1 +
 haskeline.cabal | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --cc haskeline.cabal
index f8ab65c,541ac8c..d1fe65a
--- a/haskeline.cabal
+++ b/haskeline.cabal
@@@ -1,6 -1,6 +1,6 @@@
  Name:           haskeline
- Cabal-Version:  >=1.16
+ Cabal-Version:  >=1.10
 -Version:        0.7.1.3
 +Version:        0.7.2.0
  Category:       User Interfaces
  License:        BSD3
  License-File:   LICENSE