Merge branch 'vendor/LIBEDIT'
authorJohn Marino <draco@marino.st>
Sat, 11 May 2013 19:34:39 +0000 (21:34 +0200)
committerJohn Marino <draco@marino.st>
Sat, 11 May 2013 19:34:39 +0000 (21:34 +0200)
Conflicts:
contrib/libedit/src/editline/readline.h
contrib/libedit/src/readline.c

1  2 
contrib/libedit/src/el.c
contrib/libedit/src/sys.h

Simple merge
Simple merge