]> granicus.if.org Git - php/commit
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)
commit4608341303a35d05cd9d12c7db39c702151a5d39
tree445f67b6b7241bb86f3cd8da3d4cc18cf20b0e7d
parent4ad5c82016bcf54883577a7c0dfc1ada24141da6
parent9d75bf35e96bfc5c8d629ecef6807a90b4c98be7
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Mark this test as requiring internet connecion.