Merge branch 'jc/maint-lf-to-crlf-keep-crlf'

* jc/maint-lf-to-crlf-keep-crlf: lf_to_crlf_filter(): resurrect CRLF->CRLF hack

Junio C Hamano committed Dec 22, 2011 at 11:27 UTC 339aff0846ccf21905d047c20e3c7d077d6f300b

No changes.