com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/json/json.c ext/json/php_json.h
| From: | JulienPauli | Date: | Mon, 17 Feb 2014 09:36:13 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/json/json.c ext/json/php_json.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76038@lists.php.net to get a copy of this message | ||
Commit: baafdad1503943150617654240780a170156d92a
Author: Julien Pauli <jpauli@php.net> Mon, 17 Feb 2014 10:36:13 +0100
Parents: f7f524aada86241c6c0e3c9ae2e7bdbfd533089e 786234d351c40a9b4808d1dd13d2f91f2f5314be
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=baafdad1503943150617654240780a170156d92a
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Export JsonSerializable Interface (bug #65753)
Bugs:
https://bugs.php.net/65753
Changed paths:
MM ext/json/json.c
MM ext/json/php_json.h
Diff: