Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #78642: Wrong libiconv version displayed

diff --cc NEWS
index 9cb9aa886c4ea493a7eec6f4478ba50a61937242,d2056ad45dce4b2819487698d2fe29332ab01a66..b7d193ab58164d4ad3c9b9cdfa9376e671e5e2ab
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,8 -1,12 +1,12 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2019, PHP 7.2.25
 +?? ??? ????, PHP 7.3.12
  
 -24 Oct 2019, PHP 7.2.24
+ - Iconv:
+   . Fixed bug #78642 (Wrong libiconv version displayed). (gedas at martynas,
+     cmb).
+ 
 +24 Oct 2019, PHP 7.3.11
  
  - Core:
    . Fixed bug #78535 (auto_detect_line_endings value not parsed as bool).

diff --cc ext/iconv/iconv.c
Simple merge