From: Nikita Popov <nikic@php.net>
Date: Sun, 1 Jul 2012 14:35:43 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.5RC1~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9cbd7a24b6d1d61e51fd6d32669dcfa1df30c883;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Revert JSON changes to PHP 5.3
---

9cbd7a24b6d1d61e51fd6d32669dcfa1df30c883