]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 20 Feb 2014 17:54:35 +0000 (18:54 +0100)
committerAnatol Belski <ab@php.net>
Thu, 20 Feb 2014 17:54:35 +0000 (18:54 +0100)
commit6d4d4155d26f8725365ee24797ecd14cba049a53
tree1b205e7115fb7546faec696af12fa82d7ea03dc5
parentca313caa4bb84d86c4f0b37493791fe27ee869af
parent10eb0070700382f966bf260e44135e1f724a15d2
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed leak introduced after CVE/upgrade