]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/1997'
authorChristoph M. Becker <cmbecker69@gmx.de>
Thu, 8 Sep 2016 15:00:07 +0000 (17:00 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Thu, 8 Sep 2016 15:00:07 +0000 (17:00 +0200)
1  2 
ext/standard/config.m4
ext/standard/config.w32

Simple merge
Simple merge