diff options
author | Stanislav Malyshev <stas@php.net> | 2012-05-02 00:11:19 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2012-05-02 00:11:19 -0700 |
commit | 8c41e45eec83abdb57f0f3f447fdfee9c627caaf (patch) | |
tree | 231d0fd5f36bfd020ef2d953bd8bb22ac024bbf6 /ext/mysqli/php_mysqli_structs.h | |
parent | a499dfc37dde04f8d5f3c1cabaeef1cb5d985376 (diff) | |
parent | e25eea8b838e22692c59cad1279a2e13970d5254 (diff) | |
download | php-git-8c41e45eec83abdb57f0f3f447fdfee9c627caaf.tar.gz |
Merge branch 'PHP-5.4'
* PHP-5.4:
merge 5.3.11 stuff
organize NEWS
Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards information) and"
Diffstat (limited to 'ext/mysqli/php_mysqli_structs.h')
0 files changed, 0 insertions, 0 deletions