Merge branch 'PHP-5.6'
authorChristoph M. Becker <cmb@php.net>
Tue, 21 Jul 2015 00:00:16 +0000 (02:00 +0200)
committerChristoph M. Becker <cmb@php.net>
Tue, 21 Jul 2015 00:00:16 +0000 (02:00 +0200)
* PHP-5.6:
  Add tests for json_last_error()/json_last_error_msg() failures


Trivial merge