git: Merge branch 'vendor/LIBEDIT'

[John Marino]

commit 594c4953027a5ecfd13624ff56bf1a61d8898663
Merge: 441874d c8e4d2b
Author: John Marino <draco at marino.st>
Date:   Sat May 11 21:34:39 2013 +0200

    Merge branch 'vendor/LIBEDIT'
    
    Conflicts:
    	contrib/libedit/src/editline/readline.h
    	contrib/libedit/src/readline.c

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/594c4953027a5ecfd13624ff56bf1a61d8898663


-- 
DragonFly BSD source repository