From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 21 Mar 2016 08:22:02 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~441
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e5ac8940a68188413d9e49cdffd267a05a35c28;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)
---

1e5ac8940a68188413d9e49cdffd267a05a35c28