Merge branch 'maint-1.5.4' into maint

diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh
index 90ea081db666d707246e37affc5676e6c3502741..2bfeac986eadeca0064b1aee808d08b2f86082c4 100755 (executable)
--- a/t/t0020-crlf.sh
+++ b/t/t0020-crlf.sh
@@ -5,7 +5,7 @@ test_description='CRLF conversion'
 . ./test-lib.sh
 
 q_to_nul () {
-       tr Q '\000'
+       perl -pe 'y/Q/\000/'
 }
 
 q_to_cr () {