git: Merge branch 'vendor/GREP'

[John Marino]

commit 5be44d7264347781e3ed476d25d623ecb3181508
Merge: f561435 680a9cb
Author: John Marino <draco at marino.st>
Date:   Sat Oct 11 00:51:31 2014 +0200

    Merge branch 'vendor/GREP'
    
    Conflicts:
    	contrib/grep/src/main.c

Summary of changes:

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


-- 
DragonFly BSD source repository