From: Stanislav Malyshev <stas@php.net>
Date: Wed, 14 May 2014 05:22:03 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~278^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a169310f0d046f3acdf2872e58a7d01710beaa2;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.4.30 next
---

5a169310f0d046f3acdf2872e58a7d01710beaa2