Merge branch 'PHP-5.5' into PHP-5.6
authorJohannes Schlüter <johannes@php.net>
Sat, 4 Oct 2014 18:06:44 +0000 (20:06 +0200)
committerJohannes Schlüter <johannes@php.net>
Sat, 4 Oct 2014 18:06:44 +0000 (20:06 +0200)
1  2 
ext/reflection/php_reflection.c

Simple merge