]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorFerenc Kovacs <tyrael@php.net>
Wed, 18 Feb 2015 18:48:50 +0000 (19:48 +0100)
committerFerenc Kovacs <tyrael@php.net>
Wed, 18 Feb 2015 18:48:50 +0000 (19:48 +0100)
commit24be46323b288ecb5c588fcef86bc9a8ffa05024
tree9285ff9792979067cb9d130547bc1768abdb166e
parent08b6fe9ef135798aa16a894e5773f8cd76ab1fec
parentc17a17e44b47662cb304bb5497fb7c8b86381548
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix typo in bug#
  add CVE
  5.4.39 next

Conflicts:
configure.in
main/php_version.h
NEWS