Commit f3a4e0629ce69056c84734cfac70268956cb804f

antirez 2014-03-12T13:12:29

Merge branch 'master' of git://github.com/antirez/linenoise