Merge branch 'ab/pcre-v2' into maint

diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
index 41e74fba1e1b1a0b310160e98c0fa26a74e859ca..e7f857c1a2882c7c701af3e2ce6c3223bfd88c7c 100755 (executable)
--- a/contrib/mw-to-git/git-remote-mediawiki.perl
+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
@@ -857,7 +857,7 @@ sub mw_import_revids {
 
        my $n = 0;
        my $n_actual = 0;
-       my $last_timestamp = 0; # Placeholer in case $rev->timestamp is undefined
+       my $last_timestamp = 0; # Placeholder in case $rev->timestamp is undefined
 
        foreach my $pagerevid (@{$revision_ids}) {
                # Count page even if we skip it, since we display