Merge branch 'tr/grep-l-with-decoration'

* tr/grep-l-with-decoration: grep: fix -l/-L interaction with decoration lines

Junio C Hamano committed Jan 31, 2012 at 22:01 UTC 3e9e41659394fe5de085c90f4f86858062dfa47d

No changes.