From: Stanislav Malyshev <stas@php.net>
Date: Wed, 9 Jul 2014 04:42:20 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~103^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0f6d24bc835f15f4a43a2031f2fb4be8033e1ce;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.4.31
  fix unstable test
  5.5.16 now
---

f0f6d24bc835f15f4a43a2031f2fb4be8033e1ce