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)
commit909ca4890c06e6c96516c2bf6138626c67d8844f
treed549c8a4ee56ec5b665096f83363ab0b6ca27609
parented67e9ee22886b308e6542be273631c55f1c20b8
parent84b940c191e90f5c2d8200c25de3ef0a4f427e9b
Merge branch 'vendor/LIBEDIT'

Conflicts:
contrib/libedit/src/vi.c
contrib/libedit/src/el.c
contrib/libedit/src/filecomplete.c