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

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

Junio C Hamano committed Feb 10, 2012 at 13:59 UTC 184a7aa7bf8e42ce9aba12b92d9cf8014d04a947

No changes.