From: John Marino <draco@marino.st>
Date: Sat, 11 May 2013 19:34:39 +0000 (+0200)
Subject: Merge branch 'vendor/LIBEDIT'
X-Git-Tag: v3.6.0rc~1122
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/594c4953027a5ecfd13624ff56bf1a61d8898663

Merge branch 'vendor/LIBEDIT'

Conflicts:
	contrib/libedit/src/editline/readline.h
	contrib/libedit/src/readline.c
---

594c4953027a5ecfd13624ff56bf1a61d8898663