]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorMatteo Beccati <mbeccati@php.net>
Mon, 5 Jan 2015 11:12:02 +0000 (12:12 +0100)
committerMatteo Beccati <mbeccati@php.net>
Mon, 5 Jan 2015 11:12:02 +0000 (12:12 +0100)
* PHP-5.6:
  Update test after fixing bug #68371


Trivial merge