git: Merge remote-tracking branch 'origin/vendor/LIBEDIT'

[Rimvydas Jasinskas]

commit e1b2cf92364a2a8de3308135714fd3063c8d76db
Merge: 7eb1db9120 ae19eda893
Author: zrj <zrj at dragonflybsd.org>
Date:   Tue Apr 30 23:44:55 2019 +0300

    Merge remote-tracking branch 'origin/vendor/LIBEDIT'
    
     Conflicts:
    	contrib/libedit/src/chartype.h

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/e1b2cf92364a2a8de3308135714fd3063c8d76db


-- 
DragonFly BSD source repository