From: Christoph M. Becker <cmb@php.net>
Date: Tue, 21 Jul 2015 00:00:16 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0beta2~6^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22767a48a7bd060f3397713dfe5f2a5581496097;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Add tests for json_last_error()/json_last_error_msg() failures
---

22767a48a7bd060f3397713dfe5f2a5581496097