From: Felipe Pena <felipensp@gmail.com>
Date: Wed, 9 May 2012 00:06:15 +0000 (-0300)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~219
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4dc9545aaa8aaefffc7b4be05ae7bc6690531dec;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed bug #61978 (Object recursion not detected for classes that implement JsonSerializable)
---

4dc9545aaa8aaefffc7b4be05ae7bc6690531dec