Merge 'grep-fixes' into HEAD
commit85efa6f0127dbefc98f4d50b0a80c871a46bb4ad
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Thu, 10 Apr 2014 18:53:43 +0000 (10 13:53 -0500)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Thu, 10 Apr 2014 18:53:43 +0000 (10 13:53 -0500)
tree8c757460d09a8c6bf88d17086e87f4ce139e5538
parent98cc090b7d09fd4a1ae06ce31ff2952f1f33fb63
parent5edf3c9e09368c63c70341b2946d2822db93527f
Merge 'grep-fixes' into HEAD