From: Nikita Popov <nikic@php.net>
Date: Wed, 27 Jun 2012 10:32:20 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~91^2~24^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31dbd466410a42e0ab1a042319ba99c470616c60;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Improve JSON error handling

Conflicts:
	main/php_version.h
---

31dbd466410a42e0ab1a042319ba99c470616c60