]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Wed, 18 Feb 2015 18:49:23 +0000 (19:49 +0100)
committerFerenc Kovacs <tyrael@php.net>
Wed, 18 Feb 2015 18:49:23 +0000 (19:49 +0100)
* PHP-5.5:
  fix typo in bug#
  add CVE
  5.4.39 next


Trivial merge