From: Remi Collet <remi@php.net>
Date: Sat, 20 Feb 2016 16:43:09 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~592
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a15656b5c3bc04d83c9da05419da8318a15abad;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  cleanup, ext/json is simple PHP now
---

7a15656b5c3bc04d83c9da05419da8318a15abad