]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorYasuo Ohgaki <yohgaki@php.net>
Mon, 12 May 2014 06:38:40 +0000 (15:38 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Mon, 12 May 2014 06:38:40 +0000 (15:38 +0900)
* PHP-5.6:
  Fixed test for commit 997be125eb0228c5b1b6dd278f617791e71192c6


Trivial merge