]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Wed, 4 Feb 2015 16:32:46 +0000 (17:32 +0100)
committerJulien Pauli <jpauli@php.net>
Wed, 4 Feb 2015 16:32:46 +0000 (17:32 +0100)
commit421d309908f56c13050e132ff3fadd2682ce0220
treeeb395d55c9e6dfdd8f44cb19987d516dfe8f06fe
parente6ea244004d1e0a02d299f95fc3c77225c71ef7a
parentb86529f751c277c699f707e2506c0c84f698bc18
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.5.23 now

Conflicts:
configure.in
main/php_version.h