summaryrefslogtreecommitdiff
path: root/main/php_ini.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2013-03-19 15:47:43 +0400
committerDmitry Stogov <dmitry@zend.com>2013-03-19 15:47:43 +0400
commit960d5be52873acdf1afc67aa12b72d2cdc93119c (patch)
tree2681627ee42e08c9e4aca21039b7c892d5dc415f /main/php_ini.c
parent74e11fb14c983302c84ee88fee40248b6f9b0f9a (diff)
parent984561cfa81adfd893833bce506544349b04c803 (diff)
downloadphp-git-960d5be52873acdf1afc67aa12b72d2cdc93119c.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Partial fix for bug #64239
Diffstat (limited to 'main/php_ini.c')
0 files changed, 0 insertions, 0 deletions