]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/2082'
authorJoe Watkins <krakjoe@php.net>
Mon, 10 Oct 2016 11:14:26 +0000 (12:14 +0100)
committerJoe Watkins <krakjoe@php.net>
Mon, 10 Oct 2016 11:14:26 +0000 (12:14 +0100)
1  2 
Zend/zend_builtin_functions.c

Simple merge