]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorBob Weinand <bobwei9@hotmail.com>
Sat, 12 Apr 2014 21:55:35 +0000 (23:55 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Sat, 12 Apr 2014 21:55:35 +0000 (23:55 +0200)
1  2 
main/php_variables.c

Simple merge