]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Wed, 9 Jul 2014 04:41:06 +0000 (21:41 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 9 Jul 2014 04:41:06 +0000 (21:41 -0700)
commit393bf0e4bb30f357cd2512953cfdb8591522c9a9
tree17d3e86a22bde15bffa84037d14bf755817e4406
parentcd1130751d852ee16a164323bc415108a3e51bc8
parentb93ea59665a5024abb10b398bed8f19db61b4756
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.31
  fix unstable test

Conflicts:
configure.in
main/php_version.h