From: Julien Pauli <jpauli@php.net>
Date: Mon, 19 Sep 2016 14:43:17 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~1240
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1f35444196b3626ec8d272f714c494041f8e88a;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  Do not wrap user exception in case of custom JSON serialization
---

f1f35444196b3626ec8d272f714c494041f8e88a