From: Adam Harvey <aharvey@php.net>
Date: Fri, 23 May 2014 15:23:55 +0000 (+0000)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~268
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bbdbb6f7ebf7dc92f650e66c20201580a04d2082;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
---

bbdbb6f7ebf7dc92f650e66c20201580a04d2082