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

Merge branch 'PHP-5.5' into PHP-5.6

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

80a2716b56b0eabae018108605ce3ecfecd5ce3c