]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorJulien Pauli <jpauli@php.net>
Mon, 19 Sep 2016 14:43:17 +0000 (16:43 +0200)
committerJulien Pauli <jpauli@php.net>
Mon, 19 Sep 2016 14:43:17 +0000 (16:43 +0200)
* PHP-7.1:
  Do not wrap user exception in case of custom JSON serialization


Trivial merge