Stephane Nicoll 1cfebc0d39 Merge branch '2.5.x' into 2.6.x ... Closes gh-30333		2022-03-20 08:49:56 +01:00
..
forward-merge	Fix typo in forward-merge log message	2022-03-20 08:49:20 +01:00
prepare-forward-merge	Update some more references to 2.5.x	2021-06-11 11:54:34 +01:00