]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorYasuo Ohgaki <yohgaki@php.net>
Tue, 3 Feb 2015 03:26:25 +0000 (12:26 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Tue, 3 Feb 2015 03:26:25 +0000 (12:26 +0900)
* PHP-5.5:
  Bug #61470 is fixed only in master


Trivial merge