Merge branch 'rs/empty-archive' into maint

diff --git a/perl/Git/I18N.pm b/perl/Git/I18N.pm
index 07597dcb93a772caf7b676722c99d330ae947c47..f889fd6da91d2d9b6a7469442a02e5478f094f8d 100644 (file)
--- a/perl/Git/I18N.pm
+++ b/perl/Git/I18N.pm
@@ -2,7 +2,16 @@ package Git::I18N;
 use 5.008;
 use strict;
 use warnings;
-use Exporter 'import';
+BEGIN {
+       require Exporter;
+       if ($] < 5.008003) {
+               *import = \&Exporter::import;
+       } else {
+               # Exporter 5.57 which supports this invocation was
+               # released with perl 5.8.3
+               Exporter->import('import');
+       }
+}
 
 our @EXPORT = qw(__);
 our @EXPORT_OK = @EXPORT;
@@ -59,7 +68,7 @@ =head1 SYNOPSIS
 
        print __("Welcome to Git!\n");
 
-       printf __("The following error occured: %s\n"), $error;
+       printf __("The following error occurred: %s\n"), $error;
 
 =head1 DESCRIPTION