]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 24 Apr 2014 08:52:22 +0000 (10:52 +0200)
committerAnatol Belski <ab@php.net>
Thu, 24 Apr 2014 08:52:22 +0000 (10:52 +0200)
* PHP-5.4:
  fix dll export

1  2 
main/php_variables.c

Simple merge