From: Julien Pauli <jpauli@php.net>
Date: Wed, 4 Feb 2015 11:48:57 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.6RC1~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93315c4e1d514c2824bbadc23337603314db8f63;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Revert "json_decode() should generate a syntax error when given ""."
  Update NEWS
---

93315c4e1d514c2824bbadc23337603314db8f63