]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Fri, 20 Jun 2014 04:45:36 +0000 (06:45 +0200)
committerRemi Collet <remi@php.net>
Fri, 20 Jun 2014 04:45:36 +0000 (06:45 +0200)
* PHP-5.6:
  skip this test which fails without network


Trivial merge