]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Wed, 30 Sep 2015 11:19:18 +0000 (13:19 +0200)
committerJulien Pauli <jpauli@php.net>
Wed, 30 Sep 2015 11:19:18 +0000 (13:19 +0200)
commit0fd71d1184727ac31c1ab06bef140650a06e35b3
treee5b481f9cff5e1c1b8835f9aca2a263872dc086f
parent07a8e5ce37140690cd179d0c3ae034bd4ae718cd
parentd7fb43e30d662c7fff999521ebf15ddbb192c7ca
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed test
  5.5.31 now

Conflicts:
configure.in
main/php_version.h