git: Merge branch 'vendor/LIBEDIT'

[John Marino]

commit 909ca4890c06e6c96516c2bf6138626c67d8844f
Merge: ed67e9e 84b940c
Author: John Marino <draco at marino.st>
Date:   Mon Oct 13 19:10:37 2014 +0200

    Merge branch 'vendor/LIBEDIT'
    
    Conflicts:
    	contrib/libedit/src/vi.c

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/909ca4890c06e6c96516c2bf6138626c67d8844f


-- 
DragonFly BSD source repository