Merge 'grep-fixes' into HEAD
commit52ee32dfb49c679f185615b571e3351005ffaade
authorStepan Kasal <kasal@ucw.cz>
Wed, 16 Apr 2014 14:34:18 +0000 (16 16:34 +0200)
committerStepan Kasal <kasal@ucw.cz>
Wed, 16 Apr 2014 14:34:18 +0000 (16 16:34 +0200)
tree8c757460d09a8c6bf88d17086e87f4ce139e5538
parentd46df546a4dd6b2e90e2e33efada963cdaac8ebb
parente1033f9e7dff9b61d2fe910d750d89a7f9975c0e
Merge 'grep-fixes' into HEAD