]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0'
authorJulien Pauli <jpauli@php.net>
Wed, 30 Sep 2015 11:20:22 +0000 (13:20 +0200)
committerJulien Pauli <jpauli@php.net>
Wed, 30 Sep 2015 11:20:22 +0000 (13:20 +0200)
commit019100937d8afd74d8ad3473a24f96bca300a49d
tree4036e6fe13f8020b2749fe4a67ca240cdcdb18c2
parent1888d3a0c42be6c1619090ffb25a211202039b8b
parenta60105d7a4cadd5287da68c02992fceb06df4b2d
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed test
  5.5.31 now
  Add NTS/ZTS information to php -v