]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Thu, 31 Jan 2013 13:39:42 +0000 (14:39 +0100)
committerRemi Collet <remi@php.net>
Thu, 31 Jan 2013 13:39:42 +0000 (14:39 +0100)
* PHP-5.4:
  Mark this test as requiring internet connecion.


Trivial merge