From: Michael Wallner <mike@php.net>
Date: Mon, 30 Sep 2013 12:04:48 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.5RC1~3^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4d6a95105feb3d7a39a5dfea7c4cd3080097295;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix test
  fix memleak on resetting rebind_proc
---

d4d6a95105feb3d7a39a5dfea7c4cd3080097295