Merge branch 'vendor/GREP'
authorJohn Marino <draco@marino.st>
Fri, 10 Oct 2014 22:51:31 +0000 (00:51 +0200)
committerJohn Marino <draco@marino.st>
Fri, 10 Oct 2014 22:51:31 +0000 (00:51 +0200)
commit5be44d7264347781e3ed476d25d623ecb3181508
treebbdabfe153217fe57d4c3d9282e4bfbe5154d9b8
parentf561435f64997452deb9afa6d9c58fae0db01175
parent680a9cb8d724bb1128d1b284fa92c474e5602a13
Merge branch 'vendor/GREP'

Conflicts:
contrib/grep/src/main.c
contrib/grep/src/grep.c