]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 24 Apr 2014 08:52:59 +0000 (10:52 +0200)
committerAnatol Belski <ab@php.net>
Thu, 24 Apr 2014 08:52:59 +0000 (10:52 +0200)
commit9280e255347dc5afd235afa760920cc48eb37801
treeb4d49b2f63847bf1bf320cb663c10a6716d32aac
parentab8065e4ecdbaa59aaf5a37e62be50815af19e53
parentacfed1c4c71f25603e90f9df3930c294e5ae0726
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix dll export
main/php_variables.c