]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorYasuo Ohgaki <yohgaki@php.net>
Sat, 15 Feb 2014 09:30:50 +0000 (18:30 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Sat, 15 Feb 2014 09:30:50 +0000 (18:30 +0900)

Trivial merge