]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorJohannes Schlüter <johannes@php.net>
Sat, 4 Oct 2014 18:07:00 +0000 (20:07 +0200)
committerJohannes Schlüter <johannes@php.net>
Sat, 4 Oct 2014 18:07:00 +0000 (20:07 +0200)
1  2 
ext/reflection/php_reflection.c

Simple merge