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

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

Junio C Hamano committed Dec 28, 2011 at 11:42 UTC 23838b8a152a6363e22fdbe3f474fab904f701b3

No changes.