]> granicus.if.org Git - php/commit
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)
commitae9db5d0a227977b4b2aac34f1ba7532896201b7
tree9f7134c3a921b2c24a024df1f245790ce772f76e
parent7c20edaade5e099d9f91f55326dc5cf9c2444b41
parente9c9169e05e0f9753151c16e6a0806f9c5c614bb
Merge branch 'PHP-5.6'

* PHP-5.6:
  skip this test which fails without network