]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Sat, 13 Feb 2016 14:21:16 +0000 (15:21 +0100)
committerNikita Popov <nikic@php.net>
Sat, 13 Feb 2016 14:21:16 +0000 (15:21 +0100)
commit70c8db08c6a4882898bc347a8ab1f9205f4e8467
treef9f46976a285b7fe2b238665953e5b2512b65347
parentccc06e252bdf4c54cb2c96dbcab9a2aeb933181c
parentbc419fee5c9704eb4ce338acacbc2380c6f4427d
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/pdo_mysql/mysql_driver.c