]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorMichael Wallner <mike@php.net>
Mon, 30 Sep 2013 12:04:48 +0000 (14:04 +0200)
committerMichael Wallner <mike@php.net>
Mon, 30 Sep 2013 12:04:48 +0000 (14:04 +0200)
* PHP-5.4:
  fix test
  fix memleak on resetting rebind_proc


Trivial merge