From: Michael Wallner <mike@php.net>
Date: Wed, 30 Apr 2014 11:02:43 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~331^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42fbb952d77a53ce8995061b64e5f7c4bcef94af;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test locality inconsitency
---

42fbb952d77a53ce8995061b64e5f7c4bcef94af