Merge 'grep-fixes' into HEAD
commitc149701fd4ff6e4b359be64263fc14ae6c59977f
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Sat, 28 Dec 2013 00:09:42 +0000 (27 18:09 -0600)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Sat, 28 Dec 2013 00:09:42 +0000 (27 18:09 -0600)
tree84a50b5e6f6fcc85ffd1b288b7393d9ba9a31d68
parentd562b59a229e3a2d3f44e8ebf1d337ae543a9a81
parent61ae676fecf6728c48ec9264bd7ef88e7529d63e
Merge 'grep-fixes' into HEAD