]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Sat, 30 Jul 2016 14:29:10 +0000 (16:29 +0200)
committerNikita Popov <nikic@php.net>
Sat, 30 Jul 2016 14:29:10 +0000 (16:29 +0200)
commitdd7bea17bf45fbdc444431cce7125f393dfa0f3f
tree3b57c8b1fa8d6f35bcecec68e95fbcb8a8f5296c
parent029f8e87772f27efdee48719b266e99b0a102543
parent99613431b4a04b39ac02f564d3d2c842a5b27169
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/wddx/wddx.c