tree f56b4df6d53b8f06a19282e282a414a946fc8ea1
parent ea302905fef1dacfbbfdf6b3a350978b5792b46e
parent 4c75dad4d45423fb2a992610b9b60ecd768605f1
author Antoine Musso <hashar@free.fr> 1627665886 +0200
committer Antoine Musso <hashar@free.fr> 1627666140 +0200

Merge branch 'stable-3.2'

Bring in all the changes made by Christian Aistleitner for the migration
of Wikimedia to stable-3.2.

Change-Id: Ia2a20068201e3cdc2b50d4e3cca23d5eeed8eba0