From: Matteo Beccati <mbeccati@php.net>
Date: Wed, 19 Jun 2013 09:53:05 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b8259cdfa0f6b54984bb3268b17e7a36fa448d8;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #65047 (Test skip on client / server version)
  Remove broken client version checking
  Clean up leftover file after the test
---

9b8259cdfa0f6b54984bb3268b17e7a36fa448d8