diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-25 00:00:20 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-25 00:00:20 -0700 |
| commit | 1bad4aa355943b1b680f23ae5a3c6a18360d0fa8 (patch) | |
| tree | a62d2734b72243c4c20a407654f3abbc3b0be975 /main/php_variables.c | |
| parent | 5c34146104382aad99fe76f7985886fd9a9dd0cc (diff) | |
| parent | 81098de41c37e50d408b2312324f4f572e57f3d0 (diff) | |
| download | php-git-1bad4aa355943b1b680f23ae5a3c6a18360d0fa8.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update NEWS
add a test case previously broken by a bad fix
Revert "Fixed bug #64604"
Diffstat (limited to 'main/php_variables.c')
0 files changed, 0 insertions, 0 deletions