git: Merge branch 'vendor/LIBEDIT'

[John Marino]

commit 5fd565a09d464d3d0042df9997c41e8f1995a5b5
Merge: 06dd69f a0c9eb1
Author: John Marino <draco at marino.st>
Date:   Wed Nov 4 00:58:27 2015 +0100

    Merge branch 'vendor/LIBEDIT'
    
    Conflicts:
    	contrib/libedit/src/chartype.h
    	contrib/libedit/src/eln.c

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/5fd565a09d464d3d0042df9997c41e8f1995a5b5


-- 
DragonFly BSD source repository