From: Ferenc Kovacs <tyrael@php.net>
Date: Tue, 21 Jan 2014 01:28:32 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~1^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4142f6f58925a9db376e34754d370721a871391;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix these tests so they properly clean up after themselves.
---

c4142f6f58925a9db376e34754d370721a871391