From: Julien Pauli Date: Wed, 4 Feb 2015 16:32:46 +0000 (+0100) Subject: Merge branch 'PHP-5.5' into PHP-5.6 X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~3^2~22^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=421d309908f56c13050e132ff3fadd2682ce0220;p=php Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: 5.5.23 now Conflicts: configure.in main/php_version.h --- 421d309908f56c13050e132ff3fadd2682ce0220