From: Remi Collet <remi@php.net>
Date: Wed, 19 Jun 2013 10:26:53 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb68e0fe63866541f0f816fbcc4343ff62b81234;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Related to bug #65047 (Test skip on client / server version)
---

fb68e0fe63866541f0f816fbcc4343ff62b81234