]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorMichael Wallner <mike@php.net>
Wed, 18 Sep 2013 09:12:11 +0000 (11:12 +0200)
committerMichael Wallner <mike@php.net>
Wed, 18 Sep 2013 09:12:11 +0000 (11:12 +0200)
* PHP-5.4:
  fix a very rare case of use of uninitialized value combined with a memleak


Trivial merge