diff options
| author | Nikita Popov <nikic@php.net> | 2012-07-01 16:35:43 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-07-01 16:35:43 +0200 |
| commit | 9cbd7a24b6d1d61e51fd6d32669dcfa1df30c883 (patch) | |
| tree | f5004eea8d45360cb4169fa6326c2980f1721889 | |
| parent | b741d3315be5cbddae5a895b9dceb2b71d394366 (diff) | |
| parent | 250393f92523fffe643df06a1de2101fd50a327e (diff) | |
| download | php-git-9cbd7a24b6d1d61e51fd6d32669dcfa1df30c883.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Revert JSON changes to PHP 5.3
0 files changed, 0 insertions, 0 deletions