diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-03-19 13:07:32 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-03-19 13:07:32 +0400 |
| commit | ef8c8eaa9583130029facf2817d2c5c4b01f1c41 (patch) | |
| tree | a70da955e8e2ab6ea2e0a489c35375b513c52339 /main/php_ini.c | |
| parent | f621f0b8e7f1a2d061d37e16f71bcb2000c2a786 (diff) | |
| parent | e62bb0325763d9847847dd198e05c9b3147caf05 (diff) | |
| download | php-git-ef8c8eaa9583130029facf2817d2c5c4b01f1c41.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
Conflicts:
NEWS
Zend/zend_compile.c
Diffstat (limited to 'main/php_ini.c')
0 files changed, 0 insertions, 0 deletions