From: Adam Harvey <aharvey@php.net>
Date: Sun, 10 Nov 2013 21:15:12 +0000 (-0500)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~199
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1205a6c7dc1e5123279e1cbb946dfbc538d8a976;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Update NEWS and remove the unnecessary UPGRADING note.
  UPGRADING and NEWS
  Better test: Check combined leading/trailing
  Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
---

1205a6c7dc1e5123279e1cbb946dfbc538d8a976