diff options
| author | Stanislav Malyshev <stas@php.net> | 2012-06-26 21:53:40 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2012-06-26 21:53:40 -0700 |
| commit | ffcfa6f920f53d0b9e20883838307c08373712d5 (patch) | |
| tree | 91be15eb0c11932a1a761546db074315bd3a4810 | |
| parent | a44a1dc194e60c51a4b7716f78f34a7dc334744b (diff) | |
| parent | ad2bee193d9850cac9e214e9293f4dc3cd77d857 (diff) | |
| download | php-git-ffcfa6f920f53d0b9e20883838307c08373712d5.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
ws fix
BFN
Fix bug #62373 (serialize() generates wrong reference to the object)
Conflicts:
php.ini-development
php.ini-production
0 files changed, 0 insertions, 0 deletions