]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Tue, 9 Jun 2015 07:13:19 +0000 (09:13 +0200)
committerRemi Collet <remi@php.net>
Tue, 9 Jun 2015 07:13:19 +0000 (09:13 +0200)
* PHP-5.5:
  fix test description
  Fixed Buf #68812 Unchecked return value.


Trivial merge