]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Sat, 16 Jul 2016 21:02:34 +0000 (23:02 +0200)
committerNikita Popov <nikic@php.net>
Sat, 16 Jul 2016 21:02:34 +0000 (23:02 +0200)
commit31cbe23a9a4a47b922cd1f6db1a393c5dbdaad36
tree2a6cae5906e10991ce376fc84be92c17793cb457
parent190fbb94e79c2ba91faa96529603e67ab599b128
parent171c759d791f809ebc31711fd0b0b5bb632cd2cc
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
Zend/zend_gc.c