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

Merge branch 'PHP-5.6'

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

e7e44d7d56deec991ed53d42ef96c73d4768f65e