From: Anatol Belski <ab@php.net>
Date: Mon, 29 Sep 2014 16:12:56 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~59^2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70ff3ad7d16bde9b4a6e91f89269bbd0a23875bf;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix tests on linux
  better test cleanup
---

70ff3ad7d16bde9b4a6e91f89269bbd0a23875bf