Merge branch 'vendor/LIBEDIT'
authorJohn Marino <draco@marino.st>
Mon, 13 Oct 2014 17:10:37 +0000 (19:10 +0200)
committerJohn Marino <draco@marino.st>
Mon, 13 Oct 2014 17:10:37 +0000 (19:10 +0200)
Conflicts:
contrib/libedit/src/vi.c

1  2 
contrib/libedit/src/el.c
contrib/libedit/src/filecomplete.c

Simple merge
Simple merge