]> granicus.if.org Git - php/commitdiff
Merge remote-tracking branch 'php/master'
authorAnatol Belski <ab@php.net>
Thu, 21 Aug 2014 06:39:46 +0000 (08:39 +0200)
committerAnatol Belski <ab@php.net>
Thu, 21 Aug 2014 06:39:46 +0000 (08:39 +0200)
1  2 
Zend/zend_builtin_functions.c

Simple merge