]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorJohannes Schlüter <johannes@php.net>
Sat, 4 Oct 2014 18:00:10 +0000 (20:00 +0200)
committerJohannes Schlüter <johannes@php.net>
Sat, 4 Oct 2014 18:00:10 +0000 (20:00 +0200)
commit61d29990b428458896c299297d5e48cb30fb7ae9
tree1da20349172d8b0285a8c9dfb8e51267250ab7a4
parent0e5f475f5e3e049c428fe2857f910ab36201c071
parent136dd53ac29fabce18127b8ecb95b606f141d42d
Merge branch 'PHP-5.5' into PHP-5.6
ext/reflection/php_reflection.c